[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [platform-cvs-dev] Bug 36436: [Merge] CVS substituted keywords treated as conflicts

Axel,

This list is going to be closed. See
https://bugs.eclipse.org/bugs/show_bug.cgi?id=307424
If you want to ping a committer about your patches, please use appropriate
bugs.
If there is no bugs describing your issue, rise one.

Thank you
--
Szymon Brandys


                                                                       
             Axel Müller                                             
             <aegges@xxxxxx>                                           
             Sent by:                                                   To
             platform-cvs-dev-         platform-cvs-dev@xxxxxxxxxxx    
             bounces@xxxxxxxxx                                          cc
             rg                                                        
                                                                   Subject
                                       Re: [platform-cvs-dev] Bug 36436:
             2010-07-19 22:03          [Merge] CVS substituted keywords
                                       treated as conflicts            
                                                                       
             Please respond to                                         
               "Eclipse CVS                                            
                Integration                                            
             developers list."                                         
             <platform-cvs-dev                                         
               @eclipse.org>                                           
                                                                       
                                                                       




Is this mailing list dead? No answer for 3 months. Or is nobody interested
in
this patches?

  Axel

> 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.
>
>   Axel
>
> > 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@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/platform-cvs-dev

_______________________________________________
platform-cvs-dev mailing list
platform-cvs-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/platform-cvs-dev