# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1374088835 18000
# Node ID de269e18d09b267924996f863e4d1f6576490b97
# Parent  cd5643c229156befe8e95d9287c3c02d5ae8cdc4# Parent  f6b047cf9272121a36c47a05cee4adb0c95629fb
merge with i18n

diff -r cd5643c22915 -r de269e18d09b hgext/histedit.py
--- a/hgext/histedit.py	Sun Jul 14 21:20:02 2013 +0200
+++ b/hgext/histedit.py	Wed Jul 17 14:20:35 2013 -0500
@@ -247,7 +247,7 @@
         files.update(ctx.files())
 
     # Recompute copies (avoid recording a -> b -> a)
-    copied = copies.pathcopies(first, last)
+    copied = copies.pathcopies(base, last)
 
     # prune files which were reverted by the updates
     def samefile(f):
diff -r cd5643c22915 -r de269e18d09b tests/test-histedit-fold.t
--- a/tests/test-histedit-fold.t	Sun Jul 14 21:20:02 2013 +0200
+++ b/tests/test-histedit-fold.t	Wed Jul 17 14:20:35 2013 -0500
@@ -186,7 +186,7 @@
   $ hg commit -m '+5'
   $ echo 6 >> file
   $ hg commit -m '+6'
-  $ hg logt -G --template '{rev}:{node|short} {desc|firstline}\n'
+  $ hg logt -G
   @  3:251d831eeec5 +6
   |
   o  2:888f9082bf99 +5
@@ -266,3 +266,37 @@
   +6
   $ cd ..
 
+
+Folding with initial rename (issue3729)
+---------------------------------------
+
+  $ hg init fold-rename
+  $ cd fold-rename
+  $ echo a > a.txt
+  $ hg add a.txt
+  $ hg commit -m a
+  $ hg rename a.txt b.txt
+  $ hg commit -m rename
+  $ echo b >> b.txt
+  $ hg commit -m b
+
+  $ hg logt --follow b.txt
+  2:e0371e0426bc b
+  1:1c4f440a8085 rename
+  0:6c795aa153cb a
+
+  $ hg histedit 1c4f440a8085 --commands - 2>&1 << EOF | fixbundle
+  > pick 1c4f440a8085 rename
+  > fold e0371e0426bc b
+  > EOF
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  reverting b.txt
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+  $ hg logt --follow b.txt
+  1:cf858d235c76 rename
+  0:6c795aa153cb a
+
+  $ cd ..