Question about branching / merging
Robert Collins
robertc at robertcollins.net
Thu Sep 1 23:33:36 BST 2005
On Thu, 2005-09-01 at 12:08 -0400, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> John Eckerdal wrote:
> > Most of the operations I tested seems to work
> > fine for me. There is one problem that I have and I can not seem to get
> > branching / merging to work in a way I would consider "obvious".
>
> ...
>
> > I see that the single file has now been reverted to the state where it is on
> > the "main" branch.
>
> There was a bug in the 0.0.6 release that caused this behavior. The fix
> has been written, and will be in the 0.0.7 release.
And is already in bzr.dev if you want to use it now.
Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050902/cfb55a37/attachment.pgp
More information about the bazaar
mailing list