equal
deleted
inserted
replaced
1 adding b |
1 adding b |
2 Patch queue now empty |
2 patch queue now empty |
3 % push patch with missing target |
3 % push patch with missing target |
4 applying changeb |
4 applying changeb |
5 unable to find 'b' for patching |
5 unable to find 'b' for patching |
6 2 out of 2 hunks FAILED -- saving rejects to file b.rej |
6 2 out of 2 hunks FAILED -- saving rejects to file b.rej |
7 patch failed, unable to continue (try -v) |
7 patch failed, unable to continue (try -v) |
8 patch failed, rejects left in working dir |
8 patch failed, rejects left in working dir |
9 Errors during apply, please fix and refresh changeb |
9 errors during apply, please fix and refresh changeb |
10 % display added files |
10 % display added files |
11 a |
11 a |
12 c |
12 c |
13 % display rejections |
13 % display rejections |
14 --- b |
14 --- b |
24 a |
24 a |
25 a |
25 a |
26 +c |
26 +c |
27 +c |
27 +c |
28 adding b |
28 adding b |
29 Patch queue now empty |
29 patch queue now empty |
30 % push git patch with missing target |
30 % push git patch with missing target |
31 applying changeb |
31 applying changeb |
32 unable to find 'b' for patching |
32 unable to find 'b' for patching |
33 1 out of 1 hunks FAILED -- saving rejects to file b.rej |
33 1 out of 1 hunks FAILED -- saving rejects to file b.rej |
34 patch failed, unable to continue (try -v) |
34 patch failed, unable to continue (try -v) |
35 b: No such file or directory |
35 b: No such file or directory |
36 b not tracked! |
36 b not tracked! |
37 patch failed, rejects left in working dir |
37 patch failed, rejects left in working dir |
38 Errors during apply, please fix and refresh changeb |
38 errors during apply, please fix and refresh changeb |
39 ? b.rej |
39 ? b.rej |
40 % display added files |
40 % display added files |
41 a |
41 a |
42 c |
42 c |
43 % display rejections |
43 % display rejections |
47 literal 2 |
47 literal 2 |
48 Jc${No0000400IC2 |
48 Jc${No0000400IC2 |
49 |
49 |
50 % test push creating directory during git copy or rename |
50 % test push creating directory during git copy or rename |
51 adding a |
51 adding a |
52 Patch queue now empty |
52 patch queue now empty |
53 applying patch |
53 applying patch |
54 Now at: patch |
54 now at: patch |