[Bug 5930] New: interrupted evolve gets confused about copies

[mercurial-bugs at mercurial-scm.org]

https://bz.mercurial-scm.org/show_bug.cgi?id=5930

            Bug ID: 5930
           Summary: interrupted evolve gets confused about copies
           Product: Mercurial
           Version: 4.6
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: evolution
          Assignee: bugzilla at mercurial-scm.org
          Reporter: martinvonz at google.com
                CC: mercurial-devel at mercurial-scm.org,
                    pierre-yves.david at ens-lyon.org

Easiest explained with a test case:

  $ hg init
  $ echo a > a
  $ hg ci -Aqm a
  $ hg cp a b
  $ hg ci -m 'rename a to b'
  $ hg co -q 0
  $ echo c > c
  $ hg ci -Aqm c
  $ echo d > c
  $ echo d > d
  $ hg ci -Aqm d
  $ hg prev -q
  $ hg log -G -T '{rev} {desc}\n'
  o  3 d
  |
  @  2 c
  |
  | o  1 rename a to b
  |/
  o  0 a

  $ hg rebase -r . -d 1
  rebasing 2:d36c0562f908 "c"
  1 new orphan changesets
  $ echo conflict > c
  $ hg amend
  $ hg evolve
  move:[3] d
  atop:[5] c
  merging c
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
  abort: fix conflicts and see `hg help evolve.interrupted`
  [255]

Status mentions file 'b' (copied from 'a') here, even though it wasn't
affected by the evolved changeset (nor was 'a')

  $ hg st -C
  M b
    a
  M c
  A d
  ? c.orig

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