author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
Thu, 08 Feb 2007 16:31:21 -0200 | |
changeset 4074 | 0f9381cf9723 |
parent 3717 | 9e248cfd8b94 |
child 4190 | e8ee8fdeddb1 |
permissions | -rw-r--r-- |
2863 | 1 |
% new file |
2 |
applying patch from stdin |
|
3589
1c9b6f1237e0
test for git empty new files
Brendan Cully <brendan@kublai.com>
parents:
2907
diff
changeset
|
3 |
% new empty file |
1c9b6f1237e0
test for git empty new files
Brendan Cully <brendan@kublai.com>
parents:
2907
diff
changeset
|
4 |
applying patch from stdin |
1c9b6f1237e0
test for git empty new files
Brendan Cully <brendan@kublai.com>
parents:
2907
diff
changeset
|
5 |
empty |
2863 | 6 |
% chmod +x |
7 |
applying patch from stdin |
|
8 |
% copy |
|
9 |
applying patch from stdin |
|
10 |
a |
|
11 |
a |
|
12 |
% rename |
|
13 |
applying patch from stdin |
|
14 |
copyx |
|
3589
1c9b6f1237e0
test for git empty new files
Brendan Cully <brendan@kublai.com>
parents:
2907
diff
changeset
|
15 |
empty |
2863 | 16 |
new |
17 |
rename |
|
18 |
% delete |
|
19 |
applying patch from stdin |
|
3589
1c9b6f1237e0
test for git empty new files
Brendan Cully <brendan@kublai.com>
parents:
2907
diff
changeset
|
20 |
empty |
2863 | 21 |
new |
22 |
rename |
|
23 |
% regular diff |
|
24 |
applying patch from stdin |
|
25 |
% copy and modify |
|
26 |
applying patch from stdin |
|
27 |
a |
|
28 |
a |
|
29 |
b |
|
30 |
a |
|
31 |
a |
|
32 |
% rename and modify |
|
33 |
applying patch from stdin |
|
34 |
copy2: No such file or directory |
|
35 |
a |
|
36 |
a |
|
37 |
b |
|
38 |
c |
|
39 |
a |
|
3701
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
40 |
% one file renamed multiple times |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
41 |
applying patch from stdin |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
42 |
9 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2) |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
43 |
rename2: No such file or directory |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
44 |
rename3 |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
45 |
rename3-2 |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
46 |
a |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
47 |
a |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
48 |
b |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
49 |
c |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
50 |
a |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
51 |
|
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
52 |
a |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
53 |
a |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
54 |
b |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
55 |
c |
05c8704a3743
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3589
diff
changeset
|
56 |
a |
3716
ab5600428b08
handle files with both git binary patches and copy/rename ops
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3701
diff
changeset
|
57 |
% binary files and regular patch hunks |
ab5600428b08
handle files with both git binary patches and copy/rename ops
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3701
diff
changeset
|
58 |
applying patch from stdin |
ab5600428b08
handle files with both git binary patches and copy/rename ops
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3701
diff
changeset
|
59 |
foo |
ab5600428b08
handle files with both git binary patches and copy/rename ops
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3701
diff
changeset
|
60 |
045c85ba38952325e126c70962cc0f9d9077bc67 644 binary |
3717
9e248cfd8b94
handle files with more than one git binary patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3716
diff
changeset
|
61 |
% many binary files |
9e248cfd8b94
handle files with more than one git binary patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3716
diff
changeset
|
62 |
applying patch from stdin |
9e248cfd8b94
handle files with more than one git binary patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3716
diff
changeset
|
63 |
045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 |
9e248cfd8b94
handle files with more than one git binary patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3716
diff
changeset
|
64 |
a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 |