Repeated merges possible and displayed in brzr status
Aaron Bentley
aaron.bentley at utoronto.ca
Tue Oct 18 20:51:37 BST 2005
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Matiyam wrote:
> I am not sure if this is a bug, let's hope you can tell me.
...
> Now, if i make another "bzr merge ../main" and "bzr status" in
> "new-feature", i guess i shouldn't see any change (everything has been
> merged).
>
> BUT i get i line saying:
> "pending merges: ... (and the last commit from "main".
Yes, that's a bug. I'll fix it.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFDVVJJ0F+nu1YWqI0RAnGjAJ0TpVEH84sgHrTjyG5G63jSTZDZRgCfasN9
XWQPhRTCAo8h/ih0FgmV4ps=
=G9J6
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list