Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-git-export.out @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | 035fd2029575 |
children | 751df21dad72 |
line wrap: on
line source
adding start adding new % new file diff --git a/new b/new new file mode 100644 --- /dev/null +++ b/new @@ -0,0 +1,1 @@ +new % copy diff --git a/new b/copy copy from new copy to copy % rename diff --git a/copy b/rename rename from copy rename to rename % delete diff --git a/rename b/rename deleted file mode 100644 --- a/rename +++ /dev/null @@ -1,1 +0,0 @@ -new adding src % chmod 644 diff --git a/src b/src old mode 100644 new mode 100755 % rename+mod+chmod diff --git a/src b/dst old mode 100755 new mode 100644 rename from src rename to dst --- a/dst +++ b/dst @@ -3,3 +3,4 @@ 3 3 4 5 +a % nonexistent in tip+chmod diff --git a/src b/src old mode 100644 new mode 100755