Re: Repository and release numbering changes

Chris Pickett wrote:
> http://svn.collab.net/repos/svn/trunk/notes/merge-tracking.txt
> 
> Somebody (John Belmonte) also wrote:
> 
> "svnmerge breaks down when you want to do bi-directional merges. 
> Briefly, there is a loss of information when you do an "svnmerge merge", 
> because the automatic merge is mixed together with any subsequent 
> changes you make before the commit (e.g. to resolve conflicts).  To 
> support a bi-directional merge, you need to be able to separate those 
> two parts."

Thanks for the pointers. John is right about that, but Etienne is also
right that inherent in merging is the need for human intelligence :-)

All svnmerge really does is act like virtual yellow sticky notes
recording what changes you have or haven't merged.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com