[Bug 3949] New: Need a way to mark divergent changes as not divergent

[mercurial-bugs at selenic.com]

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

          Priority: normal
            Bug ID: 3949
                CC: mercurial-devel at selenic.com
          Assignee: pierre-yves.david at logilab.fr
           Summary: Need a way to mark divergent changes as not divergent
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: durin42 at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: unspecified
         Component: evolution
           Product: Mercurial

I somehow managed to confuse evolve and ended up with divergent changes that
were linearly related, and not actually divergent. I think what was going on
was I split a change with histedit, but I'm honestly not sure, because I let it
linger for ~2 weeks before bothering to ask marmoute about it.

In any case, it'd be nice to have a way to mark a divergence as not divergent
and desired.

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