Comment 6 for bug 235407
Revision history for this message
| Robert Collins (lifeless) wrote Re: [Bug 235407] Re: 'pop(): dictionary is empty' in tsort when showing pending merges | #6 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
a60fb26
(Get the code!)
On Fri, 2008-05-30 at 22:27 +0000, John A Meinel wrote:
> You don't need a merge directive to reproduce this. double merging will
> do it
>
> bzr init X
> bzr commit --unchanged -m 1 X
> bzr branch X Y
> bzr commit --unchanged -m 2 Y
> cd X
> bzr merge ../Y
> bzr merge --force ../Y
>
> Arguably, merge should refuse to mark the entry as a new merge if it is
> in the ancestry of the existing merges. (So that doing bzr merge ../Y;
> bzr merge --force -r 1 ../Y doesn't work)
>
> Anyway, I'll make a quick fix to 'bzr status' to still allow this, but
> really it seems like something 'merge' might be doing wrong.
there are tests that low level functions reduce duplicates by history,
so yes, soething is wrong.
-Rob
--
GPG key available at: <http://