Re: Repository and release numbering changes

Hi,

There was some discussion about svnmerge on the svn list recently (I 
subscribed, because svn stopped parsing '..' in URL's).

The issues involved in proper merging before it becomes part of svn:

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."

Just drawing Etienne's attention to this.  Thanks all the same Archie, 
it didn't occur to me that this is what SableVM needs.

It's also already in the svn repository as a contrib script:

http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge

which means there might be other things in there that might make our 
maintainers' lives easier.

Cheers,
Chris

Etienne Gagnon wrote:
> Wow!  This is the tool I've been waiting for!
> 
> Thanks Archie for the pointer.
> 
> Etienne
> 
> Archie Cobbs wrote:
> 
>>
>> Perhaps svnmerge would be useful in this situation for keeping
>> track of outstanding bug fixes.
>>
>>   http://www.dellroad.org/svnmerge/
> 
> 
> -- 
> Etienne M. Gagnon, Ph.D.            http://www.info2.uqam.ca/~egagnon/
> SableVM:                                       http://www.sablevm.org/
> SableCC:                                       http://www.sablecc.org/
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> SableVM-devel mailing list
> [email protected]
> http://sablevm.org/lists/control/listinfo/sablevm-devel