bzr-svn: informing bzr about old svn merges.

[Jelmer Vernooij]

On Tue, 2010-02-09 at 15:38 +0100, Óscar Fuentes wrote:
> 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.
bzr-svn itself doesn't use svn:mergeinfo but it does update it for the
benefit of "svn merge".

Cheers,

Jelmer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100209/78602317/attachment.pgp