[Bug 4800] New: histedit: amending during and "Edit" confused histedit

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Fri Aug 28 00:12:31 UTC 2015


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

          Priority: normal
            Bug ID: 4800
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: histedit: amending during and "Edit" confused histedit
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: pierre-yves.david at ens-lyon.org
          Hardware: PC
            Status: UNCONFIRMED
           Version: default branch
         Component: histedit
           Product: Mercurial

The replacement tracking need to get smarter. (or the operation should be
denied).

  $ cat << EOF >> $HGRCPATH
  > [extensions]
  > histedit =
  > EOF

  $ hg init boo
  $ cd boo
  $ echo a > a
  $ hg ci -Am a
  adding a
  $ echo a > b
  $ echo a > c
  $ echo a > c
  $ hg ci -Am b
  adding b
  adding c
  $ echo a > d 
  $ hg ci -Am c
  adding d
  $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan
  $ echo "pick `hg log -r 2 -T '{node|short}'`" >> plan
  $ echo "edit `hg log -r 1 -T '{node|short}'`" >> plan
  $ hg histedit -r 'all()' --commands plan
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  Make changes as needed, you may commit or record as needed now.
  When you are finished, run hg histedit --continue to resume.
  [1]
  $ hg st
  A b
  A c
  ? plan
  $ hg commit --amend b
  saved backup bundle to
$TESTTMP/boo/.hg/strip-backup/e72d22b19f8e-0d7631fd-amend-backup.hg (glob)
  $ hg histedit --continue
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  abort: 00changelog.i at e72d22b19f8e: no node!
  [255]

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


More information about the Mercurial-devel mailing list