[Bug 4851] New: touch needs to get better at handling amended changes

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Fri Sep 25 15:10:48 UTC 2015


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

            Bug ID: 4851
           Summary: touch needs to get better at handling amended changes
           Product: Mercurial
           Version: default branch
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: evolution
          Assignee: bugzilla at selenic.com
          Reporter: durin42 at gmail.com
                CC: mercurial-devel at selenic.com,
                    pierre-yves.david at ens-lyon.org

Three possible outcomes:
1) you want to un-do an amend and return to an old version of a change
2) you want to duplicate an old version of a change without creating divergence
and without dropping the successor
3) you actually want divergence

The only case we have right now is 3 - you have to record the obsolescence by
hand, which stinks. My proposed UI is something like the following, given this
history:

0 --- 1
 \--------1'

where 1 is obsoleted by 1':

  $ hg touch 1
  abort: 1 is obsoleted by 1'.
  (If you want to replace 1' with 1, do 'hg touch --replace-successors 1' or
'hg touch --duplicate 1')
  $ hg touch --diverge 1
<works silently>

I'm honestly not sure what the use case for 3 is, but we should probably
support it somehow. Note that this UI proposal is far from final, I just had an
idea while writing the bug down and figured I'd capture it here.

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


More information about the Mercurial-devel mailing list