branch6 bound to branch5 left in inconsistent state after pushing to it, if there are tags (Re: [Bug 162466])

John Arbash Meinel john at arbash-meinel.com
Mon Nov 19 16:40:19 GMT 2007


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

Adeodato Simó wrote:
> [I'm resending because I realize maybe the "SVN" bit in the original
> subject invited to skipping this mail. :)]
> 
> * Adeodato Simó [Thu, 15 Nov 2007 19:07:10 +0100]:
> 
>>> The fact that the revision stays in the svn repository but not in the
>>> public_html branch is because of the way bzr works, unrelated to bzr-
>>> svn.
> 
>> Uuh, this is right, and seems... bad to me.
> 
>> For the list: say you have a format 5 branch B1, and another branch B2
>> bound to it (I *think* the format of B2 is irrelevant). Then you create
>> B3 branching from eg. B2, you upgrade it to format 6, make a commit C1,
>> create a tag T1, and then push to B2.
> 
>> Pushing to B2 pushes C1 to B1 first, which succeeds, then T1 to B1,
>> which fails, and the process stops. B1 is left with C1, which B2 won't
>> have it.
> 

I believe you can "bzr update" in B2 to get back in sync.

I seem to have missed the beginning of this conversation, though. Since the
first part of the thread I have is "Re: [Bug..."

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHQbxzJdeBCYSNAAMRAvP3AJwKyaZ1vCHOjUg7VlWg/7B52hBm5ACdGn6t
Z2cC3CV5I6S+eGp0qLOFX/E=
=PrU7
-----END PGP SIGNATURE-----



More information about the bazaar mailing list