[Bug 3817] New: divergent bookmarks don't notice when a pull resolves the divergence

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Sun Feb 10 13:29:57 CST 2013


http://bz.selenic.com/show_bug.cgi?id=3817

          Priority: normal
            Bug ID: 3817
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: divergent bookmarks don't notice when a pull resolves
                    the divergence
          Severity: bug
    Classification: Unclassified
                OS: All
          Reporter: durin42 at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.5.1
         Component: Mercurial
           Product: Mercurial

In tonight's hilarious mergestorm, I pulled from mpm while I had one change
queued in my @ bookmark. When I pulled from mpm, I got a divergent @mpm mark,
and then pulling from crew gave me a divergent @crew.

Before I could merge, tonfa pushed a merge to crew, so I pulled again - the
@mpm divergent marker stuck around, as a linear ancestor of @crew.

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list