Can bzr-svn merge be tracked by svn?

[Jelmer Vernooij]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Francis,

Francis J. Lacoste wrote:
> Last week at Agile2009, I met a guy from a company that are using feature-
> branch mode of development with SVN. He's using git-svn on Windows and is
> finding it a little painful.
>
> He knew about bzr having tried it out last year but had a few issues
with it
> (in particular, he had trouble installing it on Windows).
>
> I talked to him about bzr 2.0 and all the changes we made. He seemed
> interested to try it out again.
>
> One thing that he finds annoying with bzr-git is that if he merge his
feature
> branch and commit on the trunk using bzr-git, SVN doesn't recognize the
two
> SVN branches as merged. So he has still to use svn to do these merges.
I'm confused - do you perhaps mean git-svn instead of bzr-git in the
last paragraph ?
>
> Do we have a similar limitation with bzr-svn?
If you did indeed mean git-svn in the paragraph above then bzr-svn
will behave (somewhat) better. Recent versions of bzr-svn will, as
well as storing the bzr revision parents, update the svn:merge-info
file properties in merge commits that are pushed. Of course this
requires that the branch that was merged in was also present in the
Subversion repository since the merged branch is referred to by a
path+revnum tuple.

bzr-svn will only set these file properties, it will never try to
convert them back to revision parents in Bazaar since most merges in
Subversion are actually cherrypicks - and those can not be tracked in
bzr yet.

Cheers,

Jelmer
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10rc1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iQIcBAEBAgAGBQJKnoMNAAoJEACAbyvXKaRX/wUP/2ivxPmb0uizdtqFPzf7gf5m
Z4LtJwQNDLHv7YhsTr4kFgO18n8hyR/NFvul1kZbCXiFszAo11lKpn4ctVYixnwq
XdfmPJVDZ4nxYGLIjaEMbsDnxGoroZerZo+AkjkhoQ2XJwAwTXmM7wm6kAKS6m1W
EfZmMOCQa+LvGytT/7Z9GkqzqVToUemak1YG2sA3dXoQNPMm3sbfNjwgQL0c9Nye
XDLIvraeRApTZzFAKWa47+g/h8wExTdN8OGzEwg+g/8jJ+OqLjaW2sgxfTGTFDI+
n8deI/gBqYrjB3dZZjLf52j5uOQGJLQOSxlRVYJNt1vovWk3C2XEMKIql1VocM5S
Vm9LjPTq3wa8YxPieK3Ds07TJ8Ip5NegyJXyV+nRfG3x9z+KwOlx5fr3TXpC+qDA
sp9mZq7hrFQP0q5AqHkU93WGa8Fb9BrbfctE/eefl51eId1x2Ooae69RqYt9kunf
NOCuIA4fX9iyRNHIWw6d+QfjguwlZcWudvWHDrFp48BMAfCv67HkzoX3Ui2mRaCt
fuLX0Bqo7Ge+pbtypGkBIMfwH6TAXB0wgLvVrWWCsTmZLM4w4++ovYZX+GCbkTMj
yFyiAHg6Z+hx4bK7k+jbwkfmRrU5QuQsx8g2zS29RNHdo9lS9T132/G8LniNUV03
z3JhrZVpgQm6Y24+jjAW
=I5G6
-----END PGP SIGNATURE-----