author | Henri Wiechers <hwiechers@gmail.com> |
Mon, 21 Dec 2009 23:01:46 +0200 | |
changeset 10121 | ac212bcc852b |
parent 6283 | 5a45c82fc7da |
permissions | -rw-r--r-- |
2907 | 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 |
|
6283
5a45c82fc7da
Revert cfebb175704f, fixing the output of 2 tests
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6279
diff
changeset
|
15 |
diff --git a/copy b/rename |
5a45c82fc7da
Revert cfebb175704f, fixing the output of 2 tests
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6279
diff
changeset
|
16 |
rename from copy |
5a45c82fc7da
Revert cfebb175704f, fixing the output of 2 tests
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6279
diff
changeset
|
17 |
rename to rename |
2907 | 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 |
|
5482
e5eedd74e70f
Use both the from and to name in mdiff.unidiff.
Dustin Sallings <dustin@spy.net>
parents:
5264
diff
changeset
|
36 |
--- a/src |
2907 | 37 |
+++ b/dst |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5482
diff
changeset
|
38 |
@@ -3,3 +3,4 @@ |
2907 | 39 |
3 |
40 |
4 |
|
41 |
5 |
|
42 |
+a |
|
3066
035fd2029575
git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2907
diff
changeset
|
43 |
% nonexistent in tip+chmod |
035fd2029575
git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2907
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:
2907
diff
changeset
|
45 |
old mode 100644 |
035fd2029575
git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2907
diff
changeset
|
46 |
new mode 100755 |
3368
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
47 |
% binary diff |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
48 |
diff --git a/binfile.bin b/binfile.bin |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
49 |
new file mode 100644 |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
50 |
index 0000000000000000000000000000000000000000..37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9 |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
51 |
GIT binary patch |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
52 |
literal 593 |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
53 |
zc$@)I0<QguP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
54 |
z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
55 |
zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
56 |
z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
57 |
zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
58 |
ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<; |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
59 |
zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
60 |
z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W- |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
61 |
zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U; |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
62 |
z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
63 |
zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#= |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
64 |
fQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf{mKw4 |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
65 |
|
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
66 |
% import binary diff |
751df21dad72
Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents:
3066
diff
changeset
|
67 |
applying b.diff |
3693
454b3a8cdf28
diff: improve detection of renames when diffing across many revisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3368
diff
changeset
|
68 |
|
4092
4ced663bebf0
git patches: handle renames of binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3702
diff
changeset
|
69 |
% rename binary file |
4ced663bebf0
git patches: handle renames of binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3702
diff
changeset
|
70 |
diff --git a/binfile.bin b/renamed.bin |
4ced663bebf0
git patches: handle renames of binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3702
diff
changeset
|
71 |
rename from binfile.bin |
4ced663bebf0
git patches: handle renames of binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3702
diff
changeset
|
72 |
rename to renamed.bin |
4ced663bebf0
git patches: handle renames of binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3702
diff
changeset
|
73 |
|
3693
454b3a8cdf28
diff: improve detection of renames when diffing across many revisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3368
diff
changeset
|
74 |
% diff across many revisions |
454b3a8cdf28
diff: improve detection of renames when diffing across many revisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3368
diff
changeset
|
75 |
diff --git a/dst2 b/dst3 |
454b3a8cdf28
diff: improve detection of renames when diffing across many revisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3368
diff
changeset
|
76 |
rename from dst2 |
454b3a8cdf28
diff: improve detection of renames when diffing across many revisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3368
diff
changeset
|
77 |
rename to dst3 |
5264
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
78 |
% reversed |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
79 |
diff --git a/dst3 b/dst2 |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
80 |
rename from dst3 |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
81 |
rename to dst2 |
3694
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
82 |
|
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
83 |
% file created before r1 and renamed before r2 |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
84 |
diff --git a/foo b/bar |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
85 |
rename from foo |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
86 |
rename to bar |
5482
e5eedd74e70f
Use both the from and to name in mdiff.unidiff.
Dustin Sallings <dustin@spy.net>
parents:
5264
diff
changeset
|
87 |
--- a/foo |
3694
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
88 |
+++ b/bar |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5482
diff
changeset
|
89 |
@@ -1,2 +1,3 @@ |
3694
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
90 |
a |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
91 |
b |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
92 |
+c |
5264
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
93 |
% reversed |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
94 |
diff --git a/bar b/foo |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
95 |
rename from bar |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
96 |
rename to foo |
5482
e5eedd74e70f
Use both the from and to name in mdiff.unidiff.
Dustin Sallings <dustin@spy.net>
parents:
5264
diff
changeset
|
97 |
--- a/bar |
5264
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
98 |
+++ b/foo |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5482
diff
changeset
|
99 |
@@ -1,3 +1,2 @@ |
5264
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
100 |
a |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
101 |
b |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
102 |
-c |
3694
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
103 |
|
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
104 |
% file created in r1 and renamed before r2 |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
105 |
diff --git a/foo b/bar |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
106 |
rename from foo |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
107 |
rename to bar |
5482
e5eedd74e70f
Use both the from and to name in mdiff.unidiff.
Dustin Sallings <dustin@spy.net>
parents:
5264
diff
changeset
|
108 |
--- a/foo |
3694
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
109 |
+++ b/bar |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5482
diff
changeset
|
110 |
@@ -1,1 +1,3 @@ |
3694
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
111 |
a |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
112 |
+b |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
113 |
+c |
5264
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
114 |
% reversed |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
115 |
diff --git a/bar b/foo |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
116 |
rename from bar |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
117 |
rename to foo |
5482
e5eedd74e70f
Use both the from and to name in mdiff.unidiff.
Dustin Sallings <dustin@spy.net>
parents:
5264
diff
changeset
|
118 |
--- a/bar |
5264
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
119 |
+++ b/foo |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5482
diff
changeset
|
120 |
@@ -1,3 +1,1 @@ |
5264
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
121 |
a |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
122 |
-b |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
123 |
-c |
3694
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
124 |
|
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
125 |
% file created after r1 and renamed before r2 |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
126 |
diff --git a/bar b/bar |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
127 |
new file mode 100644 |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
128 |
--- /dev/null |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
129 |
+++ b/bar |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
130 |
@@ -0,0 +1,3 @@ |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
131 |
+a |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
132 |
+b |
c0b1a0c72c7d
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3693
diff
changeset
|
133 |
+c |
5264
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
134 |
% reversed |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
135 |
diff --git a/bar b/bar |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
136 |
deleted file mode 100644 |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
137 |
--- a/bar |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
138 |
+++ /dev/null |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
139 |
@@ -1,3 +0,0 @@ |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
140 |
-a |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
141 |
-b |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
142 |
-c |
3695
3a2fc90d27d6
fix typo in mercurial/patch.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3694
diff
changeset
|
143 |
|
3a2fc90d27d6
fix typo in mercurial/patch.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3694
diff
changeset
|
144 |
% comparing with the working dir |
3a2fc90d27d6
fix typo in mercurial/patch.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3694
diff
changeset
|
145 |
% there's a copy in the working dir... |
3a2fc90d27d6
fix typo in mercurial/patch.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3694
diff
changeset
|
146 |
diff --git a/created2 b/created3 |
3a2fc90d27d6
fix typo in mercurial/patch.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3694
diff
changeset
|
147 |
rename from created2 |
3a2fc90d27d6
fix typo in mercurial/patch.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3694
diff
changeset
|
148 |
rename to created3 |
3a2fc90d27d6
fix typo in mercurial/patch.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3694
diff
changeset
|
149 |
|
3a2fc90d27d6
fix typo in mercurial/patch.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3694
diff
changeset
|
150 |
% ...but there's another copy between the original rev and the wd |
3a2fc90d27d6
fix typo in mercurial/patch.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3694
diff
changeset
|
151 |
diff --git a/created b/created3 |
3a2fc90d27d6
fix typo in mercurial/patch.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3694
diff
changeset
|
152 |
rename from created |
3a2fc90d27d6
fix typo in mercurial/patch.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3694
diff
changeset
|
153 |
rename to created3 |
3696
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
154 |
|
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
155 |
% ...but the source of the copy was created after the original rev |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
156 |
diff --git a/created3 b/created3 |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
157 |
new file mode 100644 |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
158 |
--- /dev/null |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
159 |
+++ b/created3 |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
160 |
@@ -0,0 +1,1 @@ |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
161 |
+ |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
162 |
% created in parent of wd; renamed in the wd |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
163 |
diff --git a/brand-new b/brand-new2 |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
164 |
rename from brand-new |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
165 |
rename to brand-new2 |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
166 |
|
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
167 |
% created between r1 and parent of wd; renamed in the wd |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
168 |
diff --git a/brand-new2 b/brand-new2 |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
169 |
new file mode 100644 |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
170 |
--- /dev/null |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
171 |
+++ b/brand-new2 |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
172 |
@@ -0,0 +1,1 @@ |
562a65635bcb
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3695
diff
changeset
|
173 |
+ |
3702
70c3ee224c08
Don't generate git patches that rename a file to multiple destinations
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3696
diff
changeset
|
174 |
% one file is copied to many destinations and removed |
70c3ee224c08
Don't generate git patches that rename a file to multiple destinations
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3696
diff
changeset
|
175 |
diff --git a/brand-new2 b/brand-new3 |
70c3ee224c08
Don't generate git patches that rename a file to multiple destinations
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3696
diff
changeset
|
176 |
rename from brand-new2 |
70c3ee224c08
Don't generate git patches that rename a file to multiple destinations
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3696
diff
changeset
|
177 |
rename to brand-new3 |
70c3ee224c08
Don't generate git patches that rename a file to multiple destinations
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3696
diff
changeset
|
178 |
diff --git a/brand-new2 b/brand-new3-2 |
70c3ee224c08
Don't generate git patches that rename a file to multiple destinations
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3696
diff
changeset
|
179 |
copy from brand-new2 |
70c3ee224c08
Don't generate git patches that rename a file to multiple destinations
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3696
diff
changeset
|
180 |
copy to brand-new3-2 |
5264
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
181 |
% reversed |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
182 |
diff --git a/brand-new3 b/brand-new2 |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
183 |
rename from brand-new3 |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
184 |
rename to brand-new2 |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
185 |
diff --git a/brand-new3-2 b/brand-new3-2 |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
186 |
deleted file mode 100644 |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
187 |
--- a/brand-new3-2 |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
188 |
+++ /dev/null |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
189 |
@@ -1,1 +0,0 @@ |
0fc16031bb45
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4679
diff
changeset
|
190 |
- |
4679
826659bd8053
git patches: correct handling of filenames with spaces
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4092
diff
changeset
|
191 |
% there should be a trailing TAB if there are spaces in the file name |
826659bd8053
git patches: correct handling of filenames with spaces
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4092
diff
changeset
|
192 |
diff --git a/with spaces b/with spaces |
826659bd8053
git patches: correct handling of filenames with spaces
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4092
diff
changeset
|
193 |
new file mode 100644 |
826659bd8053
git patches: correct handling of filenames with spaces
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4092
diff
changeset
|
194 |
--- /dev/null |
826659bd8053
git patches: correct handling of filenames with spaces
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4092
diff
changeset
|
195 |
+++ b/with spaces |
826659bd8053
git patches: correct handling of filenames with spaces
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4092
diff
changeset
|
196 |
@@ -0,0 +1,1 @@ |
826659bd8053
git patches: correct handling of filenames with spaces
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4092
diff
changeset
|
197 |
+foo |