Bug or Feature? Nothing to merge still shows "pending merge"

Gerald (Jerry) Carter jerry at samba.org
Sun Nov 4 00:09:27 GMT 2007


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

Robert (or anyone really),

Starting from:

  $ bzr --version
  Bazaar (bzr) 0.92.0.dev.0

Assume the following scenario:

1.  Create a new bzr repo name "ping"
2.  Branch from that and call it "pong"
3.  Change and commit something in "pong"
4.  Merge to "ping"
5.  Merge to "pong"
6.  Merge to "ping"
7.  Merge to "pong"
8.  Merge to "ping"
9.  Merge to "pong"
....

- From my perspective, the history between two branches will
never converge because you always see a pending merge even
when there is nothing to do.

  $ bzr status
  pending merges:
    Gerald Carter 2007-11-03 merge again

So is this non-convergence a Bug?  or a feature?





cheers, jerry
- --
=====================================================================
Samba                                    ------- http://www.samba.org
Centeris                         -----------  http://www.centeris.com
"What man is a man who does not make the world better?"      --Balian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHLQ23IR7qMdg1EfYRAjouAKCvBATQlZvqKrWarJ7QgiP3g+hnjACfYtn7
XNmvuUkiMEZvoGEr36iE7o4=
=vgaR
-----END PGP SIGNATURE-----




More information about the bazaar mailing list