Mercurial > evolve

changeset 1151:802a87359017 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-touch: add a test for rename preservation after touch This bug was recently fixed in 3.2.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 03 Nov 2014 11:41:10 +0000
parents 2c99d92faa62
children be6eff57d5bb
files tests/test-touch.t
diffstat 1 files changed, 22 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-touch.t	Mon Nov 03 11:11:14 2014 +0000
+++ b/tests/test-touch.t	Mon Nov 03 11:41:10 2014 +0000
@@ -86,3 +86,25 @@
   o  4:[0-9a-f]{12} a (re)
   
 
+check move data kept after rebase on touch:
+
+  $ touch gna1
+  $ hg commit -Am gna1
+  adding gna1
+  $ hg mv gna1 gna2
+  $ hg commit -m move
+  $ hg st -C --change=tip
+  A gna2
+    gna1
+  R gna1
+  $ hg up .^
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+
+  $ hg touch
+  1 new unstable changesets
+
+  $ hg rebase -s 11 -d 12
+  $ hg st -C --change=tip
+  A gna2
+    gna1
+  R gna1