Mercurial > hg > mercurial-crew-with-dirclash
annotate 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 |
rev | line source |
---|---|
2892 | 1 adding start |
2 adding new | |
3 % new file | |
4 diff --git a/new b/new | |
5 new file mode 100644 | |
6 --- /dev/null | |
7 +++ b/new | |
8 @@ -0,0 +1,1 @@ | |
9 +new | |
10 % copy | |
11 diff --git a/new b/copy | |
12 copy from new | |
13 copy to copy | |
14 % rename | |
15 diff --git a/copy b/rename | |
16 rename from copy | |
17 rename to rename | |
18 % delete | |
19 diff --git a/rename b/rename | |
20 deleted file mode 100644 | |
21 --- a/rename | |
22 +++ /dev/null | |
23 @@ -1,1 +0,0 @@ | |
24 -new | |
25 adding src | |
26 % chmod 644 | |
27 diff --git a/src b/src | |
28 old mode 100644 | |
29 new mode 100755 | |
30 % rename+mod+chmod | |
31 diff --git a/src b/dst | |
32 old mode 100755 | |
33 new mode 100644 | |
34 rename from src | |
35 rename to dst | |
36 --- a/dst | |
37 +++ b/dst | |
38 @@ -3,3 +3,4 @@ 3 | |
39 3 | |
40 4 | |
41 5 | |
42 +a | |
3063
035fd2029575
git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2892
diff
changeset
|
43 % nonexistent in tip+chmod |
035fd2029575
git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2892
diff
changeset
|
44 diff --git a/src b/src |
035fd2029575
git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2892
diff
changeset
|
45 old mode 100644 |
035fd2029575
git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2892
diff
changeset
|
46 new mode 100755 |