bzr-svn: informing bzr about old svn merges.

[Jelmer Vernooij]

Hi Óscar,

On Sun, 2010-01-31 at 21:24 +0100, Óscar Fuentes wrote:
> Some long-lived branches started before svn had merge-tracking
> capabilites and hence the merge information was manually tracked. After
> converting the repositories to bzr with `bzr svn-import', the divergence
> point of those branches wrt `trunk' is shown to be at the beginning of
> the branch, as if no merges had ever happened.
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.

> Is there a recommended way of making bzr aware of the last merged
> revision, so the next `bzr merge' considers only the subsequent
> revisions?
Just do a merge once, resolve the conflicts (perhaps just revert all of
the changes but not the merge revision information?) and push that
revision into svn - bzr-svn will set the required properties.

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/20100131/128a6414/attachment.pgp