Getting started with bzr-svn (was Re: bzr-svn and subversion revisions)

Jelmer Vernooij jelmer at samba.org
Mon Sep 7 17:30:57 BST 2009


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

John Szakmeister wrote:
> On Mon, Sep 7, 2009 at 7:41 AM, Jelmer Vernooij<jelmer at vernstok.nl>
> wrote: [snip]
>> Newer versions of bzr-svn won't change the mainline history in
>> Subversion by default. Instead, they'll print an error when you
>> would be about to do so and require you to set a configuration
>> variable ("append_revisions_only").
>
> *Sweet!*  Does this mean that we can repeatedly merge from the
> mainline, and push with no ill effects?  If so, that's really nice.
>
No, if you repeatedly merge from the mainline you will just get an
error trying to push your changes back to mainline unless you set this
option.

If you don't want to change what is on the mainline, don't merge it
in. Rather, merge feature branches into the mainline.

Cheers,

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

iQIcBAEBAgAGBQJKpTUsAAoJEACAbyvXKaRXkugP/3I7+2kz33bUojCHV1lgEQTV
Uv1wzydyj30el06706WkS/7U6GwC33JznE7dvUGSiMMja1Tx/NHAqZe7l8NQ6m7j
WCSDuzCjc80SlsMdEfPBMFBeEQvlAcdC5KVwpg2Iews6SE3tJKhwl+MEC0jtFB0L
R3+0PVGiWhp0JfR+qWXvLhE8JZdCwos726Ox//Z+oCbdoT3fYgC72t3O2Tqc7JUk
e6clieOqZ5qVM7q33pZqvGCDNLLOv96SdlBgSXGCvrcouqRviQZUFv2M/1m5IM1J
ctXHATKAC8Xnvwe6bp2bGGqHqN80OHzMCx8cUlVm1fsifng/7LUhZjCbZPaIjGdB
49cD0WDIoeU67yYVD7IWcSXi/eeMB3LVnQigZSjZ37vSXbry1QmN2316eKMstYCJ
ieVc6J7iJJYVCIDm6l9ytpAu93I0OytS50obcFWv55iOSSeocN4ejFOEf1tJnvbL
d82UIl9rNrjyy/P6FgBoQdj0ONvt/rTLwA+zQ5v1FgFb8Ojt0Yh7cWtEnaAziHlM
xgP4PHNV5YRkidaHvNbUTjIJbBliHL56uQ3pIXhCNtgGcH9blfx5BnvWLmR5F5XI
JKkeQyevwRNaG8pehJ1ls6Uv53h2DGqWbb81WsQZ+i90qPWF+ei/sHvmhhGFGjqf
F1XwCE77XjMwoA9TZbUa
=+YuL
-----END PGP SIGNATURE-----




More information about the bazaar mailing list