Mercurial > hg
annotate tests/test-import-git.t @ 19822:a194a33f8cb2
mq: prepare a strip extension for extraction
Strip will lives in its own extension. The extension is surprisingly called
`strip`. (as discussed in issue3824) The `mq` extension force the use of the
strip extension when its enabled. This will both necessary for backward
compatibility (people expect `mq` to comes with strip) and become some utility
function used by `mq` will move in the strip extension.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Thu, 26 Sep 2013 23:10:11 +0200 |
parents | 2da47de36b6f |
children | 9f1d4323c749 |
rev | line source |
---|---|
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
1 $ hg init repo |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
2 $ cd repo |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
3 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
4 New file: |
2864 | 5 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
6 $ hg import -d "1000000 0" -mnew - <<EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
7 > diff --git a/new b/new |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
8 > new file mode 100644 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
9 > index 0000000..7898192 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
10 > --- /dev/null |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
11 > +++ b/new |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
12 > @@ -0,0 +1 @@ |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
13 > +a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
14 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
15 applying patch from stdin |
2864 | 16 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
17 $ hg tip -q |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
18 0:ae3ee40d2079 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
19 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
20 New empty file: |
2864 | 21 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
22 $ hg import -d "1000000 0" -mempty - <<EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
23 > diff --git a/empty b/empty |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
24 > new file mode 100644 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
25 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
26 applying patch from stdin |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
27 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
28 $ hg tip -q |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
29 1:ab199dc869b5 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
30 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
31 $ hg locate empty |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
32 empty |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
33 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
34 chmod +x: |
3589
1c9b6f1237e0
test for git empty new files
Brendan Cully <brendan@kublai.com>
parents:
2864
diff
changeset
|
35 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
36 $ hg import -d "1000000 0" -msetx - <<EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
37 > diff --git a/new b/new |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
38 > old mode 100644 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
39 > new mode 100755 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
40 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
41 applying patch from stdin |
2864 | 42 |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
43 #if execbit |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
44 $ hg tip -q |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
45 2:3a34410f282e |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
46 $ test -x new |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
47 $ hg rollback -q |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
48 #else |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
49 $ hg tip -q |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
50 1:ab199dc869b5 |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
51 #endif |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
52 |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
53 Copy and removing x bit: |
2864 | 54 |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
55 $ hg import -f -d "1000000 0" -mcopy - <<EOF |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
56 > diff --git a/new b/copy |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
57 > old mode 100755 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
58 > new mode 100644 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
59 > similarity index 100% |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
60 > copy from new |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
61 > copy to copy |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
62 > diff --git a/new b/copyx |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
63 > similarity index 100% |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
64 > copy from new |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
65 > copy to copyx |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
66 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
67 applying patch from stdin |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
68 |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
69 $ test -f copy |
16898
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16524
diff
changeset
|
70 #if execbit |
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16524
diff
changeset
|
71 $ test ! -x copy |
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16524
diff
changeset
|
72 $ test -x copyx |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
73 $ hg tip -q |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
74 2:21dfaae65c71 |
16898
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16524
diff
changeset
|
75 #else |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
76 $ hg tip -q |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
77 2:0efdaa8e3bf3 |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
78 #endif |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
79 |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
80 $ hg up -qCr1 |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
81 $ hg rollback -q |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
82 |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
83 Copy (like above but independent of execbit): |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
84 |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
85 $ hg import -d "1000000 0" -mcopy - <<EOF |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
86 > diff --git a/new b/copy |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
87 > similarity index 100% |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
88 > copy from new |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
89 > copy to copy |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
90 > diff --git a/new b/copyx |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
91 > similarity index 100% |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
92 > copy from new |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
93 > copy to copyx |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
94 > EOF |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
95 applying patch from stdin |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
96 |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
97 $ hg tip -q |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
98 2:0efdaa8e3bf3 |
16898
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16524
diff
changeset
|
99 $ test -f copy |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
100 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
101 $ cat copy |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
102 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
103 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
104 $ hg cat copy |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
105 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
106 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
107 Rename: |
2864 | 108 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
109 $ hg import -d "1000000 0" -mrename - <<EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
110 > diff --git a/copy b/rename |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
111 > similarity index 100% |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
112 > rename from copy |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
113 > rename to rename |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
114 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
115 applying patch from stdin |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
116 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
117 $ hg tip -q |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
118 3:b1f57753fad2 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
119 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
120 $ hg locate |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
121 copyx |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
122 empty |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
123 new |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
124 rename |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
125 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
126 Delete: |
2864 | 127 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
128 $ hg import -d "1000000 0" -mdelete - <<EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
129 > diff --git a/copyx b/copyx |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
130 > deleted file mode 100755 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
131 > index 7898192..0000000 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
132 > --- a/copyx |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
133 > +++ /dev/null |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
134 > @@ -1 +0,0 @@ |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
135 > -a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
136 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
137 applying patch from stdin |
2864 | 138 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
139 $ hg tip -q |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
140 4:1bd1da94b9b2 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
141 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
142 $ hg locate |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
143 empty |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
144 new |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
145 rename |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
146 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
147 $ test -f copyx |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
148 [1] |
2864 | 149 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
150 Regular diff: |
2864 | 151 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
152 $ hg import -d "1000000 0" -mregular - <<EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
153 > diff --git a/rename b/rename |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
154 > index 7898192..72e1fe3 100644 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
155 > --- a/rename |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
156 > +++ b/rename |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
157 > @@ -1 +1,5 @@ |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
158 > a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
159 > +a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
160 > +a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
161 > +a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
162 > +a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
163 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
164 applying patch from stdin |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
165 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
166 $ hg tip -q |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
167 5:46fe99cb3035 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
168 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
169 Copy and modify: |
2864 | 170 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
171 $ hg import -d "1000000 0" -mcopymod - <<EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
172 > diff --git a/rename b/copy2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
173 > similarity index 80% |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
174 > copy from rename |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
175 > copy to copy2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
176 > index 72e1fe3..b53c148 100644 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
177 > --- a/rename |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
178 > +++ b/copy2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
179 > @@ -1,5 +1,5 @@ |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
180 > a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
181 > a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
182 > -a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
183 > +b |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
184 > a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
185 > a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
186 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
187 applying patch from stdin |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
188 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
189 $ hg tip -q |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
190 6:ffeb3197c12d |
2864 | 191 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
192 $ hg cat copy2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
193 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
194 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
195 b |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
196 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
197 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
198 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
199 Rename and modify: |
2864 | 200 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
201 $ hg import -d "1000000 0" -mrenamemod - <<EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
202 > diff --git a/copy2 b/rename2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
203 > similarity index 80% |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
204 > rename from copy2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
205 > rename to rename2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
206 > index b53c148..8f81e29 100644 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
207 > --- a/copy2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
208 > +++ b/rename2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
209 > @@ -1,5 +1,5 @@ |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
210 > a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
211 > a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
212 > b |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
213 > -a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
214 > +c |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
215 > a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
216 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
217 applying patch from stdin |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
218 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
219 $ hg tip -q |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
220 7:401aede9e6bb |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
221 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
222 $ hg locate copy2 |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12193
diff
changeset
|
223 [1] |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
224 $ hg cat rename2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
225 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
226 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
227 b |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
228 c |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
229 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
230 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
231 One file renamed multiple times: |
2864 | 232 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
233 $ hg import -d "1000000 0" -mmultirenames - <<EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
234 > diff --git a/rename2 b/rename3 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
235 > rename from rename2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
236 > rename to rename3 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
237 > diff --git a/rename2 b/rename3-2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
238 > rename from rename2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
239 > rename to rename3-2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
240 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
241 applying patch from stdin |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
242 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
243 $ hg tip -q |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
244 8:2ef727e684e8 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
245 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
246 $ hg log -vr. --template '{rev} {files} / {file_copies}\n' |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
247 8 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2) |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
248 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
249 $ hg locate rename2 rename3 rename3-2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
250 rename3 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
251 rename3-2 |
2864 | 252 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
253 $ hg cat rename3 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
254 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
255 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
256 b |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
257 c |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
258 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
|
259 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
260 $ hg cat rename3-2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
261 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
262 a |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
263 b |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
264 c |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
265 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
|
266 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
267 $ echo foo > foo |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
268 $ hg add foo |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
269 $ hg ci -m 'add foo' |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
270 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
271 Binary files and regular patch hunks: |
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
|
272 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
273 $ hg import -d "1000000 0" -m binaryregular - <<EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
274 > diff --git a/binary b/binary |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
275 > new file mode 100644 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
276 > index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
277 > GIT binary patch |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
278 > literal 4 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
279 > Lc\${NkU|;|M00aO5 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
280 > |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
281 > diff --git a/foo b/foo2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
282 > rename from foo |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
283 > rename to foo2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
284 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
285 applying patch from stdin |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
286 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
287 $ hg tip -q |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
288 10:27377172366e |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
289 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
290 $ cat foo2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
291 foo |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
292 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
293 $ hg manifest --debug | grep binary |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
294 045c85ba38952325e126c70962cc0f9d9077bc67 644 binary |
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
|
295 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
296 Multiple binary files: |
3717
9e248cfd8b94
handle files with more than one git binary patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3716
diff
changeset
|
297 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
298 $ hg import -d "1000000 0" -m multibinary - <<EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
299 > diff --git a/mbinary1 b/mbinary1 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
300 > new file mode 100644 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
301 > index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
302 > GIT binary patch |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
303 > literal 4 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
304 > Lc\${NkU|;|M00aO5 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
305 > |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
306 > diff --git a/mbinary2 b/mbinary2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
307 > new file mode 100644 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
308 > index 0000000000000000000000000000000000000000..112363ac1917b417ffbd7f376ca786a1e5fa7490 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
309 > GIT binary patch |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
310 > literal 5 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
311 > Mc\${NkU|\`?^000jF3jhEB |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
312 > |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
313 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
314 applying patch from stdin |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
315 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
316 $ hg tip -q |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
317 11:18b73a84b4ab |
3717
9e248cfd8b94
handle files with more than one git binary patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3716
diff
changeset
|
318 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
319 $ hg manifest --debug | grep mbinary |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
320 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
321 a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
322 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
323 Filenames with spaces: |
3717
9e248cfd8b94
handle files with more than one git binary patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3716
diff
changeset
|
324 |
17347
2da47de36b6f
check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
325 $ sed 's,EOL$,,g' <<EOF | hg import -d "1000000 0" -m spaces - |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
326 > diff --git a/foo bar b/foo bar |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
327 > new file mode 100644 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
328 > index 0000000..257cc56 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
329 > --- /dev/null |
17347
2da47de36b6f
check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
330 > +++ b/foo bar EOL |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
331 > @@ -0,0 +1 @@ |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
332 > +foo |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
333 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
334 applying patch from stdin |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
335 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
336 $ hg tip -q |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
337 12:47500ce1614e |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
338 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
339 $ cat "foo bar" |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
340 foo |
4679
826659bd8053
git patches: correct handling of filenames with spaces
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3736
diff
changeset
|
341 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
342 Copy then modify the original file: |
4679
826659bd8053
git patches: correct handling of filenames with spaces
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3736
diff
changeset
|
343 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
344 $ hg import -d "1000000 0" -m copy-mod-orig - <<EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
345 > diff --git a/foo2 b/foo2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
346 > index 257cc56..fe08ec6 100644 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
347 > --- a/foo2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
348 > +++ b/foo2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
349 > @@ -1 +1,2 @@ |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
350 > foo |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
351 > +new line |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
352 > diff --git a/foo2 b/foo3 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
353 > similarity index 100% |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
354 > copy from foo2 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
355 > copy to foo3 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
356 > EOF |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
357 applying patch from stdin |
5403
477136fa6571
Always copy the necessary files before applying a git patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5073
diff
changeset
|
358 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
359 $ hg tip -q |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
360 13:6757efb07ea9 |
12193
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
361 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
362 $ cat foo3 |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
363 foo |
927e1a677267
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com>
parents:
10928
diff
changeset
|
364 |
12577 | 365 Move text file and patch as binary |
12574
77600d697d0e
patch: fix rename text to binary file (issue2400)
Patrick Mezard <pmezard@gmail.com>
parents:
10928
diff
changeset
|
366 |
12577 | 367 $ echo a > text2 |
368 $ hg ci -Am0 | |
369 adding text2 | |
370 $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" | |
371 > diff --git a/text2 b/binary2 | |
372 > rename from text2 | |
373 > rename to binary2 | |
374 > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 | |
375 > GIT binary patch | |
376 > literal 5 | |
377 > Mc$`b*O5$Pw00T?_*Z=?k | |
378 > | |
379 > EOF | |
380 applying patch from stdin | |
12586
b96de59a2c39
tests: fix 05210e955bef merge error in test-git-import.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
12577
diff
changeset
|
381 |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12874
diff
changeset
|
382 $ cat binary2 |
12577 | 383 a |
384 b | |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12874
diff
changeset
|
385 \x00 (no-eol) (esc) |
12586
b96de59a2c39
tests: fix 05210e955bef merge error in test-git-import.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
12577
diff
changeset
|
386 |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
16910
diff
changeset
|
387 $ hg st --copies --change . |
12586
b96de59a2c39
tests: fix 05210e955bef merge error in test-git-import.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
12577
diff
changeset
|
388 A binary2 |
b96de59a2c39
tests: fix 05210e955bef merge error in test-git-import.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
12577
diff
changeset
|
389 text2 |
b96de59a2c39
tests: fix 05210e955bef merge error in test-git-import.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
12577
diff
changeset
|
390 R text2 |
16522
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
391 |
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
392 Invalid base85 content |
16523
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
393 |
16522
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
394 $ hg rollback |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
395 repository tip rolled back to revision 14 (undo import) |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
396 working directory now based on revision 14 |
16522
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
397 $ hg revert -aq |
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
398 $ hg import -d "1000000 0" -m invalid-binary - <<"EOF" |
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
399 > diff --git a/text2 b/binary2 |
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
400 > rename from text2 |
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
401 > rename to binary2 |
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
402 > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 |
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
403 > GIT binary patch |
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
404 > literal 5 |
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
405 > Mc$`b*O.$Pw00T?_*Z=?k |
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
406 > |
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
407 > EOF |
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
408 applying patch from stdin |
16523
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
409 abort: could not decode "binary2" binary patch: bad base85 character at position 6 |
16522
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
410 [255] |
16523
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
411 |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
412 $ hg revert -aq |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
413 $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
414 > diff --git a/text2 b/binary2 |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
415 > rename from text2 |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
416 > rename to binary2 |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
417 > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
418 > GIT binary patch |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
419 > literal 6 |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
420 > Mc$`b*O5$Pw00T?_*Z=?k |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
421 > |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
422 > EOF |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
423 applying patch from stdin |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
424 abort: "binary2" length is 5 bytes, should be 6 |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
425 [255] |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
426 |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
427 $ hg revert -aq |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
428 $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
429 > diff --git a/text2 b/binary2 |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
430 > rename from text2 |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
431 > rename to binary2 |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
432 > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
433 > GIT binary patch |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
434 > Mc$`b*O5$Pw00T?_*Z=?k |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
435 > |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
436 > EOF |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
437 applying patch from stdin |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
438 abort: could not extract "binary2" binary data |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
439 [255] |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
440 |
16524
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
441 Simulate a copy/paste turning LF into CRLF (issue2870) |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
442 |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
443 $ hg revert -aq |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
444 $ cat > binary.diff <<"EOF" |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
445 > diff --git a/text2 b/binary2 |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
446 > rename from text2 |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
447 > rename to binary2 |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
448 > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
449 > GIT binary patch |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
450 > literal 5 |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
451 > Mc$`b*O5$Pw00T?_*Z=?k |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
452 > |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
453 > EOF |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
454 >>> fp = file('binary.diff', 'rb') |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
455 >>> data = fp.read() |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
456 >>> fp.close() |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
457 >>> file('binary.diff', 'wb').write(data.replace('\n', '\r\n')) |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
458 $ rm binary2 |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
459 $ hg import --no-commit binary.diff |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
460 applying binary.diff |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
461 |
12874
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
462 $ cd .. |
12586
b96de59a2c39
tests: fix 05210e955bef merge error in test-git-import.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
12577
diff
changeset
|
463 |
12874
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
464 Consecutive import with renames (issue2459) |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
465 |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
466 $ hg init issue2459 |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
467 $ cd issue2459 |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
468 $ hg import --no-commit --force - <<EOF |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
469 > diff --git a/a b/a |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
470 > new file mode 100644 |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
471 > EOF |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
472 applying patch from stdin |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
473 $ hg import --no-commit --force - <<EOF |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
474 > diff --git a/a b/b |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
475 > rename from a |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
476 > rename to b |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
477 > EOF |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
478 applying patch from stdin |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
479 a has not been committed yet, so no copy data will be stored for b. |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
480 $ hg debugstate |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
481 a 0 -1 unset b |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
482 $ hg ci -m done |
bb7bf43b72fb
patch: fix copies when patching over uncommitted changed (issue2459)
Patrick Mezard <pmezard@gmail.com>
parents:
12586
diff
changeset
|
483 $ cd .. |
14385
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
484 |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
485 Renames and strip |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
486 |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
487 $ hg init renameandstrip |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
488 $ cd renameandstrip |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
489 $ echo a > a |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
490 $ hg ci -Am adda |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
491 adding a |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
492 $ hg import --no-commit -p2 - <<EOF |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
493 > diff --git a/foo/a b/foo/b |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
494 > rename from foo/a |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
495 > rename to foo/b |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
496 > EOF |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
497 applying patch from stdin |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
498 $ hg st --copies |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
499 A b |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
500 a |
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
501 R a |
16112
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
502 |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
503 Renames, similarity and git diff |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
504 |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
505 $ hg revert -aC |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
506 undeleting a |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
507 forgetting b |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
508 $ rm b |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
509 $ hg import --similarity 90 --no-commit - <<EOF |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
510 > diff --git a/a b/b |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
511 > rename from a |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
512 > rename to b |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
513 > EOF |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
514 applying patch from stdin |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
515 $ hg st --copies |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
516 A b |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
517 a |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15441
diff
changeset
|
518 R a |
14385
7709cc983025
patch: git metadata was ignored if strip > 1
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
519 $ cd .. |
14431
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
520 |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
521 Pure copy with existing destination |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
522 |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
523 $ hg init copytoexisting |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
524 $ cd copytoexisting |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
525 $ echo a > a |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
526 $ echo b > b |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
527 $ hg ci -Am add |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
528 adding a |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
529 adding b |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
530 $ hg import --no-commit - <<EOF |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
531 > diff --git a/a b/b |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
532 > copy from a |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
533 > copy to b |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
534 > EOF |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
535 applying patch from stdin |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
536 abort: cannot create b: destination already exists |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
537 [255] |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
538 $ cat b |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
539 b |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
540 |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
541 Copy and changes with existing destination |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
542 |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
543 $ hg import --no-commit - <<EOF |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
544 > diff --git a/a b/b |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
545 > copy from a |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
546 > copy to b |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
547 > --- a/a |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
548 > +++ b/b |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
549 > @@ -1,1 +1,2 @@ |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
550 > a |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
551 > +b |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
552 > EOF |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
553 applying patch from stdin |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14431
diff
changeset
|
554 cannot create b: destination already exists |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14431
diff
changeset
|
555 1 out of 1 hunks FAILED -- saving rejects to file b.rej |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14431
diff
changeset
|
556 abort: patch failed to apply |
14431
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
557 [255] |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
558 $ cat b |
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
559 b |
14535
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
560 |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
561 #if symlink |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
562 |
14535
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
563 $ ln -s b linkb |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
564 $ hg add linkb |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
565 $ hg ci -m addlinkb |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
566 $ hg import --no-commit - <<EOF |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
567 > diff --git a/linkb b/linkb |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
568 > deleted file mode 120000 |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
569 > --- a/linkb |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
570 > +++ /dev/null |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
571 > @@ -1,1 +0,0 @@ |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
572 > -badhunk |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
573 > \ No newline at end of file |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
574 > EOF |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
575 applying patch from stdin |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
576 patching file linkb |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
577 Hunk #1 FAILED at 0 |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
578 1 out of 1 hunks FAILED -- saving rejects to file linkb.rej |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
579 abort: patch failed to apply |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
580 [255] |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
581 $ hg st |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
582 ? b.rej |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
583 ? linkb.rej |
e597ef52a7c2
patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
584 |
16910
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
585 #endif |
ad229181ddbe
tests: remove 'hghave symlink' from test-import-git.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16898
diff
changeset
|
586 |
16506
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
587 Test corner case involving copies and multiple hunks (issue3384) |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
588 |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
589 $ hg revert -qa |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
590 $ hg import --no-commit - <<EOF |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
591 > diff --git a/a b/c |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
592 > copy from a |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
593 > copy to c |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
594 > --- a/a |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
595 > +++ b/c |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
596 > @@ -1,1 +1,2 @@ |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
597 > a |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
598 > +a |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
599 > @@ -2,1 +2,2 @@ |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
600 > a |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
601 > +a |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
602 > diff --git a/a b/a |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
603 > --- a/a |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
604 > +++ b/a |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
605 > @@ -1,1 +1,2 @@ |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
606 > a |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
607 > +b |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
608 > EOF |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
609 applying patch from stdin |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
610 |
14431
a6b543e05305
test-git-import: test patching existing copy targets
Patrick Mezard <pmezard@gmail.com>
parents:
14385
diff
changeset
|
611 $ cd .. |