Mercurial > public > mercurial-scm > hg

diff tests/test-rename-dir-merge @ 5229:dee573ba79f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correctly record file-level history when the local side renames a directory
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 27 Aug 2007 14:21:04 -0300
parents 7b88bd88f040
children 56e9f7b2d8fa
line wrap: on
line diff
--- a/tests/test-rename-dir-merge	Mon Aug 27 14:21:04 2007 -0300
+++ b/tests/test-rename-dir-merge	Mon Aug 27 14:21:04 2007 -0300
@@ -24,9 +24,11 @@
 echo a/* b/*
 hg st -C
 hg ci -m "3 merge 2+1" -d "0 0"
+hg debugrename b/c
 
 hg co -C 1
 hg merge --debug 2
 echo a/* b/*
 hg st -C
 hg ci -m "4 merge 1+2" -d "0 0"
+hg debugrename b/c