Re: 1.4.x branch uses svnmerge.py

Garrett Rooney <rooneg@electricjellyfish.net> wrote:

>> My limited understanding is that everyone now has to use the svnmerge
>> tool or otherwise it gets messed up, no? Doesn't it store properties
>> somewhere? So, I can't use 'svn merge -r12344:12345' without
>> confusing everyone else, right?
>
> Correct.

The only "confusion" would be that svnmerge.py won't know the revision was
already merged, and thus allow to remerge it if asked to do so. And anyway,
this can be fixed at any time with "svnmerge.py merge --record-only" which
means "don't merge, but record that it's been done" (or, of course, by
hand-editing the property).

Giovanni Bajo

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun May 14 02:36:58 2006