# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1367610017 25200
# Node ID bd19587a3347c67032cab362176b89b85b38c3c2
# Parent  f4930b533d55ad4b8910785c6b166f8a798d01bc
revert: ensure that copies and renames are honored (issue3920)

Previously, we restored the states of files, but not the additional
information the dirstate uses to track copies and renames.

diff -r f4930b533d55 -r bd19587a3347 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Fri May 03 09:44:50 2013 -0700
+++ b/mercurial/cmdutil.py	Fri May 03 12:40:17 2013 -0700
@@ -2055,6 +2055,12 @@
                 checkout(f)
                 normal(f)
 
+            copied = copies.pathcopies(repo[parent], ctx)
+
+            for f in add[0] + undelete[0] + revert[0]:
+                if f in copied:
+                    repo.dirstate.copy(copied[f], f)
+
             if targetsubs:
                 # Revert the subrepos on the revert list
                 for sub in targetsubs:
diff -r f4930b533d55 -r bd19587a3347 tests/test-revert.t
--- a/tests/test-revert.t	Fri May 03 09:44:50 2013 -0700
+++ b/tests/test-revert.t	Fri May 03 12:40:17 2013 -0700
@@ -275,4 +275,28 @@
   $ hg revert --no-backup ignored removed
   $ hg st -mardi
 
+someone set up us the copies
+
+  $ rm .hgignore
+  $ hg update -C
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg mv ignored allyour
+  $ hg copy removed base
+  $ hg commit -m rename
+
+copies and renames, you have no chance to survive make your time (issue3920)
+
+  $ hg update '.^'
+  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ hg revert -rtip -a
+  adding allyour
+  adding base
+  removing ignored
+  $ hg status -C
+  A allyour
+    ignored
+  A base
+    removed
+  R ignored
+
   $ cd ..