Re: Repository and release numbering changes

Hi Chris,

I knew (vaguely) about such problems, thanks for the pointer.  Yet, the
problems already exist in the "merge" svn command.  What I like about
svnmerge is that it does take care of annotating merge history as svn
properties; this is similar to what we currently do in the "log message"
when we apply our merge policy (e.g. start any merge commit log by
"Merged: svn merge -r... ").

So, as always, it's no silver bullet, but it is a clear improvement over
the status quo.

Merging has always been (and will probably remain for a very long time)
a difficult problem.  I do not believe that any tool will ever be able
to always do a correct automated merge for all cases.  You will need a
human to use his/her brain to see if the tool's proposal is fine.

Etienne

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

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

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCM1B0jyrJi4rH84gRAijOAJ9W/FShMgwGLp1cBztC3g8PThVOyACffpZ6
lq0z9d1p3oGOXWmu4U5lYSs=
=3Cbt
-----END PGP SIGNATURE-----