bzr-svn: informing bzr about old svn merges.
Óscar Fuentes
ofv at wanadoo.es
Tue Feb 9 14:38:48 GMT 2010
Jelmer Vernooij <jelmer at vernstok.nl> writes:
[snip]
>> Please Jelmer confirm this: after that operation, do not rely on svn
>> merge track system for merging with svn again. If you ever want to merge
>> with svn again, use explicit revision ranges. (I say this because the
>> property svn:mergeinfo was changed by the commit of the bzr merge)
>
> You should be able to use "svn merge" without revision ranges just fine
> after doing this - that's the whole reason bzr updates svn:mergeinfo.
Thanks Jelmer. Then I misunderstood when you said on this thread that
bzr-svn does not use mergeinfo created by svn:
Jelmer Vernooij <jelmer at samba.org> writes:
> bzr-svn doesn't use the svn merge information at all, even if it is
> present. The svn merg information is cherrypicking information, and
> bzr doesn't support tracking cherrypicks yet so bzr-svn can't convert
> svn:merge to anything.
More information about the bazaar
mailing list