[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [platform-cvs-dev] Bug 36436: [Merge] CVS substituted keywords treated as conflicts
- From: Szymon Brandys <Szymon.Brandys@xxxxxxxxxx>
- Date: Tue, 20 Jul 2010 13:29:49 +0200
- Delivered-to: email@example.com
This list is going to be closed. See
If you want to ping a committer about your patches, please use appropriate
If there is no bugs describing your issue, rise one.
Sent by: To
Re: [platform-cvs-dev] Bug 36436:
2010-07-19 22:03 [Merge] CVS substituted keywords
treated as conflicts
Please respond to
Is this mailing list dead? No answer for 3 months. Or is nobody interested
> Hmm, my patch for the Sync Preview works only if the files to be merged
> differ only in the CSV keywords. If there are additional changes I still
> get a conflict shown in the preview even if the changes do not conflict.
> Which class does determine if there is a conflict? I could not find it.
> > Hi,
> > I have submitted two patches to a address the problems mentioned in
> > https://bugs.eclipse.org/bugs/show_bug.cgi?id=36436
> > The first patch adds the -kk option to the CVS merge command when the
> > merge
> > is done without preview into the local workspace.
> > The second patch modifies the compare function in the Sync Preview so
> > that
> > CVS keywords are ignored and thus do not create pseudo conflicts.
> > I would suggest to split the existing bug entry into two separate bugs.
> > The two patches that I have submitted are completely independent and
> > provide
> > fixes for two that independent problems (well, the symptoms are
> > identical but the cause is different).
> > I would be happy if somebody could have a look at them. Any thoughts?
> > Axel
> > _______________________________________________
> > platform-cvs-dev mailing list
> > platform-cvs-dev@xxxxxxxxxxx
> > https://dev.eclipse.org/mailman/listinfo/platform-cvs-dev
> platform-cvs-dev mailing list
platform-cvs-dev mailing list