[Bug 4971] New: rollback + delete files + restore files + commit = disaster

[mercurial-bugs at selenic.com]

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

            Bug ID: 4971
           Summary: rollback + delete files + restore files + commit =
                    disaster
           Product: Mercurial
           Version: stable branch
          Hardware: All
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at selenic.com
          Reporter: teo8976 at gmail.com
                CC: mercurial-devel at selenic.com

Steps to reproduce (or at least, steps that triggered the issue for me more
than once):

- start from a repository where the working directory is in sync with the last
commit (i.e. "hg status" has no output)
- accidentally delete a bunch of files (we have a backup)
- do a commit -A
- realise you had deleted a bunch of files
- rollback
- restore the accidentally deleted files (from a backup)
- do a commit -A
 => expected: the files should be neither removed nor added in the commit,
because they were there in the previous commit and they are there now.
 => observed: the files are removed in the commit
- touch something (unrelated with the deleted-restored files)
- do a commit -A
 => expected: the files shouldn't have been removed in the first place and
hence shouldn't be added now
 => observed: the files are re-added NOW.

This is completely screwed up.

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