Bug or Feature? Nothing to merge still shows "pending merge"
Robert Collins
robertc at robertcollins.net
Sun Nov 4 03:15:38 GMT 2007
On Sat, 2007-11-03 at 17:09 -0700, Gerald (Jerry) Carter wrote:
> -----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?
Bug I think; a merge that changed nothing - no file convergence and no
new content, should trigger the 'nothing to do' - either at commit or at
merge time.
-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/20071104/54fe973b/attachment.pgp
More information about the bazaar
mailing list