Show More
@@ -1,939 +1,961 b'' | |||||
1 | Set up a repo |
|
1 | Set up a repo | |
2 |
|
2 | |||
3 | $ echo "[ui]" >> $HGRCPATH |
|
3 | $ echo "[ui]" >> $HGRCPATH | |
4 | $ echo "interactive=true" >> $HGRCPATH |
|
4 | $ echo "interactive=true" >> $HGRCPATH | |
5 | $ echo "[extensions]" >> $HGRCPATH |
|
5 | $ echo "[extensions]" >> $HGRCPATH | |
6 | $ echo "record=" >> $HGRCPATH |
|
6 | $ echo "record=" >> $HGRCPATH | |
7 |
|
7 | |||
8 | $ hg init a |
|
8 | $ hg init a | |
9 | $ cd a |
|
9 | $ cd a | |
10 |
|
10 | |||
11 | Select no files |
|
11 | Select no files | |
12 |
|
12 | |||
13 | $ touch empty-rw |
|
13 | $ touch empty-rw | |
14 | $ hg add empty-rw |
|
14 | $ hg add empty-rw | |
15 |
|
15 | |||
16 | $ hg record empty-rw<<EOF |
|
16 | $ hg record empty-rw<<EOF | |
17 | > n |
|
17 | > n | |
18 | > EOF |
|
18 | > EOF | |
19 | diff --git a/empty-rw b/empty-rw |
|
19 | diff --git a/empty-rw b/empty-rw | |
20 | new file mode 100644 |
|
20 | new file mode 100644 | |
21 | examine changes to 'empty-rw'? [Ynsfdaq?] |
|
21 | examine changes to 'empty-rw'? [Ynsfdaq?] | |
22 | no changes to record |
|
22 | no changes to record | |
23 |
|
23 | |||
24 | $ hg tip -p |
|
24 | $ hg tip -p | |
25 | changeset: -1:000000000000 |
|
25 | changeset: -1:000000000000 | |
26 | tag: tip |
|
26 | tag: tip | |
27 | user: |
|
27 | user: | |
28 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
28 | date: Thu Jan 01 00:00:00 1970 +0000 | |
29 |
|
29 | |||
30 |
|
30 | |||
31 |
|
31 | |||
32 | Select files but no hunks |
|
32 | Select files but no hunks | |
33 |
|
33 | |||
34 | $ hg record empty-rw<<EOF |
|
34 | $ hg record empty-rw<<EOF | |
35 | > y |
|
35 | > y | |
36 | > n |
|
36 | > n | |
37 | > EOF |
|
37 | > EOF | |
38 | diff --git a/empty-rw b/empty-rw |
|
38 | diff --git a/empty-rw b/empty-rw | |
39 | new file mode 100644 |
|
39 | new file mode 100644 | |
40 | examine changes to 'empty-rw'? [Ynsfdaq?] |
|
40 | examine changes to 'empty-rw'? [Ynsfdaq?] | |
41 | abort: empty commit message |
|
41 | abort: empty commit message | |
42 | [255] |
|
42 | [255] | |
43 |
|
43 | |||
44 | $ hg tip -p |
|
44 | $ hg tip -p | |
45 | changeset: -1:000000000000 |
|
45 | changeset: -1:000000000000 | |
46 | tag: tip |
|
46 | tag: tip | |
47 | user: |
|
47 | user: | |
48 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
48 | date: Thu Jan 01 00:00:00 1970 +0000 | |
49 |
|
49 | |||
50 |
|
50 | |||
51 |
|
51 | |||
52 | Record empty file |
|
52 | Record empty file | |
53 |
|
53 | |||
54 | $ hg record -d '0 0' -m empty empty-rw<<EOF |
|
54 | $ hg record -d '0 0' -m empty empty-rw<<EOF | |
55 | > y |
|
55 | > y | |
56 | > y |
|
56 | > y | |
57 | > EOF |
|
57 | > EOF | |
58 | diff --git a/empty-rw b/empty-rw |
|
58 | diff --git a/empty-rw b/empty-rw | |
59 | new file mode 100644 |
|
59 | new file mode 100644 | |
60 | examine changes to 'empty-rw'? [Ynsfdaq?] |
|
60 | examine changes to 'empty-rw'? [Ynsfdaq?] | |
61 |
|
61 | |||
62 | $ hg tip -p |
|
62 | $ hg tip -p | |
63 | changeset: 0:c0708cf4e46e |
|
63 | changeset: 0:c0708cf4e46e | |
64 | tag: tip |
|
64 | tag: tip | |
65 | user: test |
|
65 | user: test | |
66 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
66 | date: Thu Jan 01 00:00:00 1970 +0000 | |
67 | summary: empty |
|
67 | summary: empty | |
68 |
|
68 | |||
69 |
|
69 | |||
70 |
|
70 | |||
71 | Summary shows we updated to the new cset |
|
71 | Summary shows we updated to the new cset | |
72 |
|
72 | |||
73 | $ hg summary |
|
73 | $ hg summary | |
74 | parent: 0:c0708cf4e46e tip |
|
74 | parent: 0:c0708cf4e46e tip | |
75 | empty |
|
75 | empty | |
76 | branch: default |
|
76 | branch: default | |
77 | commit: (clean) |
|
77 | commit: (clean) | |
78 | update: (current) |
|
78 | update: (current) | |
79 |
|
79 | |||
80 | Rename empty file |
|
80 | Rename empty file | |
81 |
|
81 | |||
82 | $ hg mv empty-rw empty-rename |
|
82 | $ hg mv empty-rw empty-rename | |
83 | $ hg record -d '1 0' -m rename<<EOF |
|
83 | $ hg record -d '1 0' -m rename<<EOF | |
84 | > y |
|
84 | > y | |
85 | > EOF |
|
85 | > EOF | |
86 | diff --git a/empty-rw b/empty-rename |
|
86 | diff --git a/empty-rw b/empty-rename | |
87 | rename from empty-rw |
|
87 | rename from empty-rw | |
88 | rename to empty-rename |
|
88 | rename to empty-rename | |
89 | examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?] |
|
89 | examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?] | |
90 |
|
90 | |||
91 | $ hg tip -p |
|
91 | $ hg tip -p | |
92 | changeset: 1:d695e8dcb197 |
|
92 | changeset: 1:d695e8dcb197 | |
93 | tag: tip |
|
93 | tag: tip | |
94 | user: test |
|
94 | user: test | |
95 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
95 | date: Thu Jan 01 00:00:01 1970 +0000 | |
96 | summary: rename |
|
96 | summary: rename | |
97 |
|
97 | |||
98 |
|
98 | |||
99 |
|
99 | |||
100 | Copy empty file |
|
100 | Copy empty file | |
101 |
|
101 | |||
102 | $ hg cp empty-rename empty-copy |
|
102 | $ hg cp empty-rename empty-copy | |
103 | $ hg record -d '2 0' -m copy<<EOF |
|
103 | $ hg record -d '2 0' -m copy<<EOF | |
104 | > y |
|
104 | > y | |
105 | > EOF |
|
105 | > EOF | |
106 | diff --git a/empty-rename b/empty-copy |
|
106 | diff --git a/empty-rename b/empty-copy | |
107 | copy from empty-rename |
|
107 | copy from empty-rename | |
108 | copy to empty-copy |
|
108 | copy to empty-copy | |
109 | examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?] |
|
109 | examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?] | |
110 |
|
110 | |||
111 | $ hg tip -p |
|
111 | $ hg tip -p | |
112 | changeset: 2:1d4b90bea524 |
|
112 | changeset: 2:1d4b90bea524 | |
113 | tag: tip |
|
113 | tag: tip | |
114 | user: test |
|
114 | user: test | |
115 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
115 | date: Thu Jan 01 00:00:02 1970 +0000 | |
116 | summary: copy |
|
116 | summary: copy | |
117 |
|
117 | |||
118 |
|
118 | |||
119 |
|
119 | |||
120 | Delete empty file |
|
120 | Delete empty file | |
121 |
|
121 | |||
122 | $ hg rm empty-copy |
|
122 | $ hg rm empty-copy | |
123 | $ hg record -d '3 0' -m delete<<EOF |
|
123 | $ hg record -d '3 0' -m delete<<EOF | |
124 | > y |
|
124 | > y | |
125 | > EOF |
|
125 | > EOF | |
126 | diff --git a/empty-copy b/empty-copy |
|
126 | diff --git a/empty-copy b/empty-copy | |
127 | deleted file mode 100644 |
|
127 | deleted file mode 100644 | |
128 | examine changes to 'empty-copy'? [Ynsfdaq?] |
|
128 | examine changes to 'empty-copy'? [Ynsfdaq?] | |
129 |
|
129 | |||
130 | $ hg tip -p |
|
130 | $ hg tip -p | |
131 | changeset: 3:b39a238f01a1 |
|
131 | changeset: 3:b39a238f01a1 | |
132 | tag: tip |
|
132 | tag: tip | |
133 | user: test |
|
133 | user: test | |
134 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
134 | date: Thu Jan 01 00:00:03 1970 +0000 | |
135 | summary: delete |
|
135 | summary: delete | |
136 |
|
136 | |||
137 |
|
137 | |||
138 |
|
138 | |||
139 | Add binary file |
|
139 | Add binary file | |
140 |
|
140 | |||
141 | $ hg bundle --base -2 tip.bundle |
|
141 | $ hg bundle --base -2 tip.bundle | |
142 | 1 changesets found |
|
142 | 1 changesets found | |
143 | $ hg add tip.bundle |
|
143 | $ hg add tip.bundle | |
144 | $ hg record -d '4 0' -m binary<<EOF |
|
144 | $ hg record -d '4 0' -m binary<<EOF | |
145 | > y |
|
145 | > y | |
146 | > EOF |
|
146 | > EOF | |
147 | diff --git a/tip.bundle b/tip.bundle |
|
147 | diff --git a/tip.bundle b/tip.bundle | |
148 | new file mode 100644 |
|
148 | new file mode 100644 | |
149 | this is a binary file |
|
149 | this is a binary file | |
150 | examine changes to 'tip.bundle'? [Ynsfdaq?] |
|
150 | examine changes to 'tip.bundle'? [Ynsfdaq?] | |
151 |
|
151 | |||
152 | $ hg tip -p |
|
152 | $ hg tip -p | |
153 | changeset: 4:ad816da3711e |
|
153 | changeset: 4:ad816da3711e | |
154 | tag: tip |
|
154 | tag: tip | |
155 | user: test |
|
155 | user: test | |
156 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
156 | date: Thu Jan 01 00:00:04 1970 +0000 | |
157 | summary: binary |
|
157 | summary: binary | |
158 |
|
158 | |||
159 | diff -r b39a238f01a1 -r ad816da3711e tip.bundle |
|
159 | diff -r b39a238f01a1 -r ad816da3711e tip.bundle | |
160 | Binary file tip.bundle has changed |
|
160 | Binary file tip.bundle has changed | |
161 |
|
161 | |||
162 |
|
162 | |||
163 | Change binary file |
|
163 | Change binary file | |
164 |
|
164 | |||
165 | $ hg bundle --base -2 tip.bundle |
|
165 | $ hg bundle --base -2 tip.bundle | |
166 | 1 changesets found |
|
166 | 1 changesets found | |
167 | $ hg record -d '5 0' -m binary-change<<EOF |
|
167 | $ hg record -d '5 0' -m binary-change<<EOF | |
168 | > y |
|
168 | > y | |
169 | > EOF |
|
169 | > EOF | |
170 | diff --git a/tip.bundle b/tip.bundle |
|
170 | diff --git a/tip.bundle b/tip.bundle | |
171 | this modifies a binary file (all or nothing) |
|
171 | this modifies a binary file (all or nothing) | |
172 | examine changes to 'tip.bundle'? [Ynsfdaq?] |
|
172 | examine changes to 'tip.bundle'? [Ynsfdaq?] | |
173 |
|
173 | |||
174 | $ hg tip -p |
|
174 | $ hg tip -p | |
175 | changeset: 5:dccd6f3eb485 |
|
175 | changeset: 5:dccd6f3eb485 | |
176 | tag: tip |
|
176 | tag: tip | |
177 | user: test |
|
177 | user: test | |
178 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
178 | date: Thu Jan 01 00:00:05 1970 +0000 | |
179 | summary: binary-change |
|
179 | summary: binary-change | |
180 |
|
180 | |||
181 | diff -r ad816da3711e -r dccd6f3eb485 tip.bundle |
|
181 | diff -r ad816da3711e -r dccd6f3eb485 tip.bundle | |
182 | Binary file tip.bundle has changed |
|
182 | Binary file tip.bundle has changed | |
183 |
|
183 | |||
184 |
|
184 | |||
185 | Rename and change binary file |
|
185 | Rename and change binary file | |
186 |
|
186 | |||
187 | $ hg mv tip.bundle top.bundle |
|
187 | $ hg mv tip.bundle top.bundle | |
188 | $ hg bundle --base -2 top.bundle |
|
188 | $ hg bundle --base -2 top.bundle | |
189 | 1 changesets found |
|
189 | 1 changesets found | |
190 | $ hg record -d '6 0' -m binary-change-rename<<EOF |
|
190 | $ hg record -d '6 0' -m binary-change-rename<<EOF | |
191 | > y |
|
191 | > y | |
192 | > EOF |
|
192 | > EOF | |
193 | diff --git a/tip.bundle b/top.bundle |
|
193 | diff --git a/tip.bundle b/top.bundle | |
194 | rename from tip.bundle |
|
194 | rename from tip.bundle | |
195 | rename to top.bundle |
|
195 | rename to top.bundle | |
196 | this modifies a binary file (all or nothing) |
|
196 | this modifies a binary file (all or nothing) | |
197 | examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?] |
|
197 | examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?] | |
198 |
|
198 | |||
199 | $ hg tip -p |
|
199 | $ hg tip -p | |
200 | changeset: 6:7fa44105f5b3 |
|
200 | changeset: 6:7fa44105f5b3 | |
201 | tag: tip |
|
201 | tag: tip | |
202 | user: test |
|
202 | user: test | |
203 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
203 | date: Thu Jan 01 00:00:06 1970 +0000 | |
204 | summary: binary-change-rename |
|
204 | summary: binary-change-rename | |
205 |
|
205 | |||
206 | diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle |
|
206 | diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle | |
207 | Binary file tip.bundle has changed |
|
207 | Binary file tip.bundle has changed | |
208 | diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle |
|
208 | diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle | |
209 | Binary file top.bundle has changed |
|
209 | Binary file top.bundle has changed | |
210 |
|
210 | |||
211 |
|
211 | |||
212 | Add plain file |
|
212 | Add plain file | |
213 |
|
213 | |||
214 | $ for i in 1 2 3 4 5 6 7 8 9 10; do |
|
214 | $ for i in 1 2 3 4 5 6 7 8 9 10; do | |
215 | > echo $i >> plain |
|
215 | > echo $i >> plain | |
216 | > done |
|
216 | > done | |
217 |
|
217 | |||
218 | $ hg add plain |
|
218 | $ hg add plain | |
219 | $ hg record -d '7 0' -m plain plain<<EOF |
|
219 | $ hg record -d '7 0' -m plain plain<<EOF | |
220 | > y |
|
220 | > y | |
221 | > y |
|
221 | > y | |
222 | > EOF |
|
222 | > EOF | |
223 | diff --git a/plain b/plain |
|
223 | diff --git a/plain b/plain | |
224 | new file mode 100644 |
|
224 | new file mode 100644 | |
225 | examine changes to 'plain'? [Ynsfdaq?] |
|
225 | examine changes to 'plain'? [Ynsfdaq?] | |
226 |
|
226 | |||
227 | $ hg tip -p |
|
227 | $ hg tip -p | |
228 | changeset: 7:11fb457c1be4 |
|
228 | changeset: 7:11fb457c1be4 | |
229 | tag: tip |
|
229 | tag: tip | |
230 | user: test |
|
230 | user: test | |
231 | date: Thu Jan 01 00:00:07 1970 +0000 |
|
231 | date: Thu Jan 01 00:00:07 1970 +0000 | |
232 | summary: plain |
|
232 | summary: plain | |
233 |
|
233 | |||
234 | diff -r 7fa44105f5b3 -r 11fb457c1be4 plain |
|
234 | diff -r 7fa44105f5b3 -r 11fb457c1be4 plain | |
235 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
235 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
236 | +++ b/plain Thu Jan 01 00:00:07 1970 +0000 |
|
236 | +++ b/plain Thu Jan 01 00:00:07 1970 +0000 | |
237 | @@ -0,0 +1,10 @@ |
|
237 | @@ -0,0 +1,10 @@ | |
238 | +1 |
|
238 | +1 | |
239 | +2 |
|
239 | +2 | |
240 | +3 |
|
240 | +3 | |
241 | +4 |
|
241 | +4 | |
242 | +5 |
|
242 | +5 | |
243 | +6 |
|
243 | +6 | |
244 | +7 |
|
244 | +7 | |
245 | +8 |
|
245 | +8 | |
246 | +9 |
|
246 | +9 | |
247 | +10 |
|
247 | +10 | |
248 |
|
248 | |||
249 |
|
249 | |||
250 | Modify end of plain file |
|
250 | Modify end of plain file | |
251 |
|
251 | |||
252 | $ echo 11 >> plain |
|
252 | $ echo 11 >> plain | |
253 | $ hg record -d '8 0' -m end plain <<EOF |
|
253 | $ hg record -d '8 0' -m end plain <<EOF | |
254 | > y |
|
254 | > y | |
255 | > y |
|
255 | > y | |
256 | > EOF |
|
256 | > EOF | |
257 | diff --git a/plain b/plain |
|
257 | diff --git a/plain b/plain | |
258 | 1 hunks, 1 lines changed |
|
258 | 1 hunks, 1 lines changed | |
259 | examine changes to 'plain'? [Ynsfdaq?] |
|
259 | examine changes to 'plain'? [Ynsfdaq?] | |
260 | @@ -8,3 +8,4 @@ |
|
260 | @@ -8,3 +8,4 @@ | |
261 | 8 |
|
261 | 8 | |
262 | 9 |
|
262 | 9 | |
263 | 10 |
|
263 | 10 | |
264 | +11 |
|
264 | +11 | |
265 | record this change to 'plain'? [Ynsfdaq?] |
|
265 | record this change to 'plain'? [Ynsfdaq?] | |
266 |
|
266 | |||
267 | Modify end of plain file, no EOL |
|
267 | Modify end of plain file, no EOL | |
268 |
|
268 | |||
269 | $ hg tip --template '{node}' >> plain |
|
269 | $ hg tip --template '{node}' >> plain | |
270 | $ hg record -d '9 0' -m noeol plain <<EOF |
|
270 | $ hg record -d '9 0' -m noeol plain <<EOF | |
271 | > y |
|
271 | > y | |
272 | > y |
|
272 | > y | |
273 | > EOF |
|
273 | > EOF | |
274 | diff --git a/plain b/plain |
|
274 | diff --git a/plain b/plain | |
275 | 1 hunks, 1 lines changed |
|
275 | 1 hunks, 1 lines changed | |
276 | examine changes to 'plain'? [Ynsfdaq?] |
|
276 | examine changes to 'plain'? [Ynsfdaq?] | |
277 | @@ -9,3 +9,4 @@ |
|
277 | @@ -9,3 +9,4 @@ | |
278 | 9 |
|
278 | 9 | |
279 | 10 |
|
279 | 10 | |
280 | 11 |
|
280 | 11 | |
281 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
281 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 | |
282 | \ No newline at end of file |
|
282 | \ No newline at end of file | |
283 | record this change to 'plain'? [Ynsfdaq?] |
|
283 | record this change to 'plain'? [Ynsfdaq?] | |
284 |
|
284 | |||
285 | Modify end of plain file, add EOL |
|
285 | Modify end of plain file, add EOL | |
286 |
|
286 | |||
287 | $ echo >> plain |
|
287 | $ echo >> plain | |
288 | $ hg record -d '10 0' -m eol plain <<EOF |
|
288 | $ echo 1 > plain2 | |
|
289 | $ hg add plain2 | |||
|
290 | $ hg record -d '10 0' -m eol plain plain2 <<EOF | |||
289 | > y |
|
291 | > y | |
290 | > y |
|
292 | > y | |
291 | > y |
|
293 | > y | |
292 | > EOF |
|
294 | > EOF | |
293 | diff --git a/plain b/plain |
|
295 | diff --git a/plain b/plain | |
294 | 1 hunks, 1 lines changed |
|
296 | 1 hunks, 1 lines changed | |
295 | examine changes to 'plain'? [Ynsfdaq?] |
|
297 | examine changes to 'plain'? [Ynsfdaq?] | |
296 | @@ -9,4 +9,4 @@ |
|
298 | @@ -9,4 +9,4 @@ | |
297 | 9 |
|
299 | 9 | |
298 | 10 |
|
300 | 10 | |
299 | 11 |
|
301 | 11 | |
300 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
302 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 | |
301 | \ No newline at end of file |
|
303 | \ No newline at end of file | |
302 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
304 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 | |
303 |
record |
|
305 | record change 1/3 to 'plain'? [Ynsfdaq?] | |
|
306 | diff --git a/plain2 b/plain2 | |||
|
307 | new file mode 100644 | |||
|
308 | examine changes to 'plain2'? [Ynsfdaq?] | |||
304 |
|
309 | |||
305 | Modify beginning, trim end, record both |
|
310 | Modify beginning, trim end, record both, add another file to test | |
|
311 | changes numbering | |||
306 |
|
312 | |||
307 | $ rm plain |
|
313 | $ rm plain | |
308 | $ for i in 2 2 3 4 5 6 7 8 9 10; do |
|
314 | $ for i in 2 2 3 4 5 6 7 8 9 10; do | |
309 | > echo $i >> plain |
|
315 | > echo $i >> plain | |
310 | > done |
|
316 | > done | |
|
317 | $ echo 2 >> plain2 | |||
311 |
|
318 | |||
312 | $ hg record -d '10 0' -m begin-and-end plain <<EOF |
|
319 | $ hg record -d '10 0' -m begin-and-end plain plain2 <<EOF | |
|
320 | > y | |||
|
321 | > y | |||
313 | > y |
|
322 | > y | |
314 | > y |
|
323 | > y | |
315 | > y |
|
324 | > y | |
316 | > EOF |
|
325 | > EOF | |
317 | diff --git a/plain b/plain |
|
326 | diff --git a/plain b/plain | |
318 | 2 hunks, 3 lines changed |
|
327 | 2 hunks, 3 lines changed | |
319 | examine changes to 'plain'? [Ynsfdaq?] |
|
328 | examine changes to 'plain'? [Ynsfdaq?] | |
320 | @@ -1,4 +1,4 @@ |
|
329 | @@ -1,4 +1,4 @@ | |
321 | -1 |
|
330 | -1 | |
322 | +2 |
|
331 | +2 | |
323 | 2 |
|
332 | 2 | |
324 | 3 |
|
333 | 3 | |
325 | 4 |
|
334 | 4 | |
326 |
record change 1/ |
|
335 | record change 1/4 to 'plain'? [Ynsfdaq?] | |
327 | @@ -8,5 +8,3 @@ |
|
336 | @@ -8,5 +8,3 @@ | |
328 | 8 |
|
337 | 8 | |
329 | 9 |
|
338 | 9 | |
330 | 10 |
|
339 | 10 | |
331 | -11 |
|
340 | -11 | |
332 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
341 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 | |
333 |
record change 2/ |
|
342 | record change 2/4 to 'plain'? [Ynsfdaq?] | |
|
343 | diff --git a/plain2 b/plain2 | |||
|
344 | 1 hunks, 1 lines changed | |||
|
345 | examine changes to 'plain2'? [Ynsfdaq?] | |||
|
346 | @@ -1,1 +1,2 @@ | |||
|
347 | 1 | |||
|
348 | +2 | |||
|
349 | record change 4/4 to 'plain2'? [Ynsfdaq?] | |||
334 |
|
350 | |||
335 | $ hg tip -p |
|
351 | $ hg tip -p | |
336 |
changeset: 11: |
|
352 | changeset: 11:21df83db12b8 | |
337 | tag: tip |
|
353 | tag: tip | |
338 | user: test |
|
354 | user: test | |
339 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
355 | date: Thu Jan 01 00:00:10 1970 +0000 | |
340 | summary: begin-and-end |
|
356 | summary: begin-and-end | |
341 |
|
357 | |||
342 | diff -r cd07d48e8cbe -r efca65c9b09e plain |
|
358 | diff -r ddb8b281c3ff -r 21df83db12b8 plain | |
343 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
359 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 | |
344 | +++ b/plain Thu Jan 01 00:00:10 1970 +0000 |
|
360 | +++ b/plain Thu Jan 01 00:00:10 1970 +0000 | |
345 | @@ -1,4 +1,4 @@ |
|
361 | @@ -1,4 +1,4 @@ | |
346 | -1 |
|
362 | -1 | |
347 | +2 |
|
363 | +2 | |
348 | 2 |
|
364 | 2 | |
349 | 3 |
|
365 | 3 | |
350 | 4 |
|
366 | 4 | |
351 | @@ -8,5 +8,3 @@ |
|
367 | @@ -8,5 +8,3 @@ | |
352 | 8 |
|
368 | 8 | |
353 | 9 |
|
369 | 9 | |
354 | 10 |
|
370 | 10 | |
355 | -11 |
|
371 | -11 | |
356 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
372 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 | |
|
373 | diff -r ddb8b281c3ff -r 21df83db12b8 plain2 | |||
|
374 | --- a/plain2 Thu Jan 01 00:00:10 1970 +0000 | |||
|
375 | +++ b/plain2 Thu Jan 01 00:00:10 1970 +0000 | |||
|
376 | @@ -1,1 +1,2 @@ | |||
|
377 | 1 | |||
|
378 | +2 | |||
357 |
|
379 | |||
358 |
|
380 | |||
359 | Trim beginning, modify end |
|
381 | Trim beginning, modify end | |
360 |
|
382 | |||
361 | $ rm plain |
|
383 | $ rm plain | |
362 | > for i in 4 5 6 7 8 9 10.new; do |
|
384 | > for i in 4 5 6 7 8 9 10.new; do | |
363 | > echo $i >> plain |
|
385 | > echo $i >> plain | |
364 | > done |
|
386 | > done | |
365 |
|
387 | |||
366 | Record end |
|
388 | Record end | |
367 |
|
389 | |||
368 | $ hg record -d '11 0' -m end-only plain <<EOF |
|
390 | $ hg record -d '11 0' -m end-only plain <<EOF | |
369 | > y |
|
391 | > y | |
370 | > n |
|
392 | > n | |
371 | > y |
|
393 | > y | |
372 | > EOF |
|
394 | > EOF | |
373 | diff --git a/plain b/plain |
|
395 | diff --git a/plain b/plain | |
374 | 2 hunks, 4 lines changed |
|
396 | 2 hunks, 4 lines changed | |
375 | examine changes to 'plain'? [Ynsfdaq?] |
|
397 | examine changes to 'plain'? [Ynsfdaq?] | |
376 | @@ -1,9 +1,6 @@ |
|
398 | @@ -1,9 +1,6 @@ | |
377 | -2 |
|
399 | -2 | |
378 | -2 |
|
400 | -2 | |
379 | -3 |
|
401 | -3 | |
380 | 4 |
|
402 | 4 | |
381 | 5 |
|
403 | 5 | |
382 | 6 |
|
404 | 6 | |
383 | 7 |
|
405 | 7 | |
384 | 8 |
|
406 | 8 | |
385 | 9 |
|
407 | 9 | |
386 | record change 1/2 to 'plain'? [Ynsfdaq?] |
|
408 | record change 1/2 to 'plain'? [Ynsfdaq?] | |
387 | @@ -4,7 +1,7 @@ |
|
409 | @@ -4,7 +1,7 @@ | |
388 | 4 |
|
410 | 4 | |
389 | 5 |
|
411 | 5 | |
390 | 6 |
|
412 | 6 | |
391 | 7 |
|
413 | 7 | |
392 | 8 |
|
414 | 8 | |
393 | 9 |
|
415 | 9 | |
394 | -10 |
|
416 | -10 | |
395 | +10.new |
|
417 | +10.new | |
396 | record change 2/2 to 'plain'? [Ynsfdaq?] |
|
418 | record change 2/2 to 'plain'? [Ynsfdaq?] | |
397 |
|
419 | |||
398 | $ hg tip -p |
|
420 | $ hg tip -p | |
399 |
changeset: 12:7 |
|
421 | changeset: 12:99337501826f | |
400 | tag: tip |
|
422 | tag: tip | |
401 | user: test |
|
423 | user: test | |
402 | date: Thu Jan 01 00:00:11 1970 +0000 |
|
424 | date: Thu Jan 01 00:00:11 1970 +0000 | |
403 | summary: end-only |
|
425 | summary: end-only | |
404 |
|
426 | |||
405 | diff -r efca65c9b09e -r 7d1e66983c15 plain |
|
427 | diff -r 21df83db12b8 -r 99337501826f plain | |
406 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
428 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 | |
407 | +++ b/plain Thu Jan 01 00:00:11 1970 +0000 |
|
429 | +++ b/plain Thu Jan 01 00:00:11 1970 +0000 | |
408 | @@ -7,4 +7,4 @@ |
|
430 | @@ -7,4 +7,4 @@ | |
409 | 7 |
|
431 | 7 | |
410 | 8 |
|
432 | 8 | |
411 | 9 |
|
433 | 9 | |
412 | -10 |
|
434 | -10 | |
413 | +10.new |
|
435 | +10.new | |
414 |
|
436 | |||
415 |
|
437 | |||
416 | Record beginning |
|
438 | Record beginning | |
417 |
|
439 | |||
418 | $ hg record -d '12 0' -m begin-only plain <<EOF |
|
440 | $ hg record -d '12 0' -m begin-only plain <<EOF | |
419 | > y |
|
441 | > y | |
420 | > y |
|
442 | > y | |
421 | > EOF |
|
443 | > EOF | |
422 | diff --git a/plain b/plain |
|
444 | diff --git a/plain b/plain | |
423 | 1 hunks, 3 lines changed |
|
445 | 1 hunks, 3 lines changed | |
424 | examine changes to 'plain'? [Ynsfdaq?] |
|
446 | examine changes to 'plain'? [Ynsfdaq?] | |
425 | @@ -1,6 +1,3 @@ |
|
447 | @@ -1,6 +1,3 @@ | |
426 | -2 |
|
448 | -2 | |
427 | -2 |
|
449 | -2 | |
428 | -3 |
|
450 | -3 | |
429 | 4 |
|
451 | 4 | |
430 | 5 |
|
452 | 5 | |
431 | 6 |
|
453 | 6 | |
432 | record this change to 'plain'? [Ynsfdaq?] |
|
454 | record this change to 'plain'? [Ynsfdaq?] | |
433 |
|
455 | |||
434 | $ hg tip -p |
|
456 | $ hg tip -p | |
435 |
changeset: 13: |
|
457 | changeset: 13:bbd45465d540 | |
436 | tag: tip |
|
458 | tag: tip | |
437 | user: test |
|
459 | user: test | |
438 | date: Thu Jan 01 00:00:12 1970 +0000 |
|
460 | date: Thu Jan 01 00:00:12 1970 +0000 | |
439 | summary: begin-only |
|
461 | summary: begin-only | |
440 |
|
462 | |||
441 | diff -r 7d1e66983c15 -r a09fc62a0e61 plain |
|
463 | diff -r 99337501826f -r bbd45465d540 plain | |
442 | --- a/plain Thu Jan 01 00:00:11 1970 +0000 |
|
464 | --- a/plain Thu Jan 01 00:00:11 1970 +0000 | |
443 | +++ b/plain Thu Jan 01 00:00:12 1970 +0000 |
|
465 | +++ b/plain Thu Jan 01 00:00:12 1970 +0000 | |
444 | @@ -1,6 +1,3 @@ |
|
466 | @@ -1,6 +1,3 @@ | |
445 | -2 |
|
467 | -2 | |
446 | -2 |
|
468 | -2 | |
447 | -3 |
|
469 | -3 | |
448 | 4 |
|
470 | 4 | |
449 | 5 |
|
471 | 5 | |
450 | 6 |
|
472 | 6 | |
451 |
|
473 | |||
452 |
|
474 | |||
453 | Add to beginning, trim from end |
|
475 | Add to beginning, trim from end | |
454 |
|
476 | |||
455 | $ rm plain |
|
477 | $ rm plain | |
456 | $ for i in 1 2 3 4 5 6 7 8 9; do |
|
478 | $ for i in 1 2 3 4 5 6 7 8 9; do | |
457 | > echo $i >> plain |
|
479 | > echo $i >> plain | |
458 | > done |
|
480 | > done | |
459 |
|
481 | |||
460 | Record end |
|
482 | Record end | |
461 |
|
483 | |||
462 | $ hg record --traceback -d '13 0' -m end-again plain<<EOF |
|
484 | $ hg record --traceback -d '13 0' -m end-again plain<<EOF | |
463 | > y |
|
485 | > y | |
464 | > n |
|
486 | > n | |
465 | > y |
|
487 | > y | |
466 | > EOF |
|
488 | > EOF | |
467 | diff --git a/plain b/plain |
|
489 | diff --git a/plain b/plain | |
468 | 2 hunks, 4 lines changed |
|
490 | 2 hunks, 4 lines changed | |
469 | examine changes to 'plain'? [Ynsfdaq?] |
|
491 | examine changes to 'plain'? [Ynsfdaq?] | |
470 | @@ -1,6 +1,9 @@ |
|
492 | @@ -1,6 +1,9 @@ | |
471 | +1 |
|
493 | +1 | |
472 | +2 |
|
494 | +2 | |
473 | +3 |
|
495 | +3 | |
474 | 4 |
|
496 | 4 | |
475 | 5 |
|
497 | 5 | |
476 | 6 |
|
498 | 6 | |
477 | 7 |
|
499 | 7 | |
478 | 8 |
|
500 | 8 | |
479 | 9 |
|
501 | 9 | |
480 | record change 1/2 to 'plain'? [Ynsfdaq?] |
|
502 | record change 1/2 to 'plain'? [Ynsfdaq?] | |
481 | @@ -1,7 +4,6 @@ |
|
503 | @@ -1,7 +4,6 @@ | |
482 | 4 |
|
504 | 4 | |
483 | 5 |
|
505 | 5 | |
484 | 6 |
|
506 | 6 | |
485 | 7 |
|
507 | 7 | |
486 | 8 |
|
508 | 8 | |
487 | 9 |
|
509 | 9 | |
488 | -10.new |
|
510 | -10.new | |
489 | record change 2/2 to 'plain'? [Ynsfdaq?] |
|
511 | record change 2/2 to 'plain'? [Ynsfdaq?] | |
490 |
|
512 | |||
491 | Add to beginning, middle, end |
|
513 | Add to beginning, middle, end | |
492 |
|
514 | |||
493 | $ rm plain |
|
515 | $ rm plain | |
494 | $ for i in 1 2 3 4 5 5.new 5.reallynew 6 7 8 9 10 11; do |
|
516 | $ for i in 1 2 3 4 5 5.new 5.reallynew 6 7 8 9 10 11; do | |
495 | > echo $i >> plain |
|
517 | > echo $i >> plain | |
496 | > done |
|
518 | > done | |
497 |
|
519 | |||
498 | Record beginning, middle |
|
520 | Record beginning, middle | |
499 |
|
521 | |||
500 | $ hg record -d '14 0' -m middle-only plain <<EOF |
|
522 | $ hg record -d '14 0' -m middle-only plain <<EOF | |
501 | > y |
|
523 | > y | |
502 | > y |
|
524 | > y | |
503 | > y |
|
525 | > y | |
504 | > n |
|
526 | > n | |
505 | > EOF |
|
527 | > EOF | |
506 | diff --git a/plain b/plain |
|
528 | diff --git a/plain b/plain | |
507 | 3 hunks, 7 lines changed |
|
529 | 3 hunks, 7 lines changed | |
508 | examine changes to 'plain'? [Ynsfdaq?] |
|
530 | examine changes to 'plain'? [Ynsfdaq?] | |
509 | @@ -1,2 +1,5 @@ |
|
531 | @@ -1,2 +1,5 @@ | |
510 | +1 |
|
532 | +1 | |
511 | +2 |
|
533 | +2 | |
512 | +3 |
|
534 | +3 | |
513 | 4 |
|
535 | 4 | |
514 | 5 |
|
536 | 5 | |
515 | record change 1/3 to 'plain'? [Ynsfdaq?] |
|
537 | record change 1/3 to 'plain'? [Ynsfdaq?] | |
516 | @@ -1,6 +4,8 @@ |
|
538 | @@ -1,6 +4,8 @@ | |
517 | 4 |
|
539 | 4 | |
518 | 5 |
|
540 | 5 | |
519 | +5.new |
|
541 | +5.new | |
520 | +5.reallynew |
|
542 | +5.reallynew | |
521 | 6 |
|
543 | 6 | |
522 | 7 |
|
544 | 7 | |
523 | 8 |
|
545 | 8 | |
524 | 9 |
|
546 | 9 | |
525 | record change 2/3 to 'plain'? [Ynsfdaq?] |
|
547 | record change 2/3 to 'plain'? [Ynsfdaq?] | |
526 | @@ -3,4 +8,6 @@ |
|
548 | @@ -3,4 +8,6 @@ | |
527 | 6 |
|
549 | 6 | |
528 | 7 |
|
550 | 7 | |
529 | 8 |
|
551 | 8 | |
530 | 9 |
|
552 | 9 | |
531 | +10 |
|
553 | +10 | |
532 | +11 |
|
554 | +11 | |
533 | record change 3/3 to 'plain'? [Ynsfdaq?] |
|
555 | record change 3/3 to 'plain'? [Ynsfdaq?] | |
534 |
|
556 | |||
535 | $ hg tip -p |
|
557 | $ hg tip -p | |
536 |
changeset: 15:7 |
|
558 | changeset: 15:f34a7937ec33 | |
537 | tag: tip |
|
559 | tag: tip | |
538 | user: test |
|
560 | user: test | |
539 | date: Thu Jan 01 00:00:14 1970 +0000 |
|
561 | date: Thu Jan 01 00:00:14 1970 +0000 | |
540 | summary: middle-only |
|
562 | summary: middle-only | |
541 |
|
563 | |||
542 |
diff -r c0b8 |
|
564 | diff -r 82c065d0b850 -r f34a7937ec33 plain | |
543 | --- a/plain Thu Jan 01 00:00:13 1970 +0000 |
|
565 | --- a/plain Thu Jan 01 00:00:13 1970 +0000 | |
544 | +++ b/plain Thu Jan 01 00:00:14 1970 +0000 |
|
566 | +++ b/plain Thu Jan 01 00:00:14 1970 +0000 | |
545 | @@ -1,5 +1,10 @@ |
|
567 | @@ -1,5 +1,10 @@ | |
546 | +1 |
|
568 | +1 | |
547 | +2 |
|
569 | +2 | |
548 | +3 |
|
570 | +3 | |
549 | 4 |
|
571 | 4 | |
550 | 5 |
|
572 | 5 | |
551 | +5.new |
|
573 | +5.new | |
552 | +5.reallynew |
|
574 | +5.reallynew | |
553 | 6 |
|
575 | 6 | |
554 | 7 |
|
576 | 7 | |
555 | 8 |
|
577 | 8 | |
556 |
|
578 | |||
557 |
|
579 | |||
558 | Record end |
|
580 | Record end | |
559 |
|
581 | |||
560 | $ hg record -d '15 0' -m end-only plain <<EOF |
|
582 | $ hg record -d '15 0' -m end-only plain <<EOF | |
561 | > y |
|
583 | > y | |
562 | > y |
|
584 | > y | |
563 | > EOF |
|
585 | > EOF | |
564 | diff --git a/plain b/plain |
|
586 | diff --git a/plain b/plain | |
565 | 1 hunks, 2 lines changed |
|
587 | 1 hunks, 2 lines changed | |
566 | examine changes to 'plain'? [Ynsfdaq?] |
|
588 | examine changes to 'plain'? [Ynsfdaq?] | |
567 | @@ -9,3 +9,5 @@ |
|
589 | @@ -9,3 +9,5 @@ | |
568 | 7 |
|
590 | 7 | |
569 | 8 |
|
591 | 8 | |
570 | 9 |
|
592 | 9 | |
571 | +10 |
|
593 | +10 | |
572 | +11 |
|
594 | +11 | |
573 | record this change to 'plain'? [Ynsfdaq?] |
|
595 | record this change to 'plain'? [Ynsfdaq?] | |
574 |
|
596 | |||
575 | $ hg tip -p |
|
597 | $ hg tip -p | |
576 |
changeset: 16: |
|
598 | changeset: 16:f9900b71a04c | |
577 | tag: tip |
|
599 | tag: tip | |
578 | user: test |
|
600 | user: test | |
579 | date: Thu Jan 01 00:00:15 1970 +0000 |
|
601 | date: Thu Jan 01 00:00:15 1970 +0000 | |
580 | summary: end-only |
|
602 | summary: end-only | |
581 |
|
603 | |||
582 | diff -r 7d137997f3a6 -r 4959e3ff13eb plain |
|
604 | diff -r f34a7937ec33 -r f9900b71a04c plain | |
583 | --- a/plain Thu Jan 01 00:00:14 1970 +0000 |
|
605 | --- a/plain Thu Jan 01 00:00:14 1970 +0000 | |
584 | +++ b/plain Thu Jan 01 00:00:15 1970 +0000 |
|
606 | +++ b/plain Thu Jan 01 00:00:15 1970 +0000 | |
585 | @@ -9,3 +9,5 @@ |
|
607 | @@ -9,3 +9,5 @@ | |
586 | 7 |
|
608 | 7 | |
587 | 8 |
|
609 | 8 | |
588 | 9 |
|
610 | 9 | |
589 | +10 |
|
611 | +10 | |
590 | +11 |
|
612 | +11 | |
591 |
|
613 | |||
592 |
|
614 | |||
593 | $ mkdir subdir |
|
615 | $ mkdir subdir | |
594 | $ cd subdir |
|
616 | $ cd subdir | |
595 | $ echo a > a |
|
617 | $ echo a > a | |
596 | $ hg ci -d '16 0' -Amsubdir |
|
618 | $ hg ci -d '16 0' -Amsubdir | |
597 | adding subdir/a |
|
619 | adding subdir/a | |
598 |
|
620 | |||
599 | $ echo a >> a |
|
621 | $ echo a >> a | |
600 | $ hg record -d '16 0' -m subdir-change a <<EOF |
|
622 | $ hg record -d '16 0' -m subdir-change a <<EOF | |
601 | > y |
|
623 | > y | |
602 | > y |
|
624 | > y | |
603 | > EOF |
|
625 | > EOF | |
604 | diff --git a/subdir/a b/subdir/a |
|
626 | diff --git a/subdir/a b/subdir/a | |
605 | 1 hunks, 1 lines changed |
|
627 | 1 hunks, 1 lines changed | |
606 | examine changes to 'subdir/a'? [Ynsfdaq?] |
|
628 | examine changes to 'subdir/a'? [Ynsfdaq?] | |
607 | @@ -1,1 +1,2 @@ |
|
629 | @@ -1,1 +1,2 @@ | |
608 | a |
|
630 | a | |
609 | +a |
|
631 | +a | |
610 | record this change to 'subdir/a'? [Ynsfdaq?] |
|
632 | record this change to 'subdir/a'? [Ynsfdaq?] | |
611 |
|
633 | |||
612 | $ hg tip -p |
|
634 | $ hg tip -p | |
613 |
changeset: 18: |
|
635 | changeset: 18:61be427a9deb | |
614 | tag: tip |
|
636 | tag: tip | |
615 | user: test |
|
637 | user: test | |
616 | date: Thu Jan 01 00:00:16 1970 +0000 |
|
638 | date: Thu Jan 01 00:00:16 1970 +0000 | |
617 | summary: subdir-change |
|
639 | summary: subdir-change | |
618 |
|
640 | |||
619 |
diff -r |
|
641 | diff -r a7ffae4d61cb -r 61be427a9deb subdir/a | |
620 | --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
642 | --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 | |
621 | +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
643 | +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 | |
622 | @@ -1,1 +1,2 @@ |
|
644 | @@ -1,1 +1,2 @@ | |
623 | a |
|
645 | a | |
624 | +a |
|
646 | +a | |
625 |
|
647 | |||
626 |
|
648 | |||
627 | $ echo a > f1 |
|
649 | $ echo a > f1 | |
628 | $ echo b > f2 |
|
650 | $ echo b > f2 | |
629 | $ hg add f1 f2 |
|
651 | $ hg add f1 f2 | |
630 |
|
652 | |||
631 | $ hg ci -mz -d '17 0' |
|
653 | $ hg ci -mz -d '17 0' | |
632 |
|
654 | |||
633 | $ echo a >> f1 |
|
655 | $ echo a >> f1 | |
634 | $ echo b >> f2 |
|
656 | $ echo b >> f2 | |
635 |
|
657 | |||
636 | Help, quit |
|
658 | Help, quit | |
637 |
|
659 | |||
638 | $ hg record <<EOF |
|
660 | $ hg record <<EOF | |
639 | > ? |
|
661 | > ? | |
640 | > q |
|
662 | > q | |
641 | > EOF |
|
663 | > EOF | |
642 | diff --git a/subdir/f1 b/subdir/f1 |
|
664 | diff --git a/subdir/f1 b/subdir/f1 | |
643 | 1 hunks, 1 lines changed |
|
665 | 1 hunks, 1 lines changed | |
644 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
666 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
645 | y - record this change |
|
667 | y - record this change | |
646 | n - skip this change |
|
668 | n - skip this change | |
647 | s - skip remaining changes to this file |
|
669 | s - skip remaining changes to this file | |
648 | f - record remaining changes to this file |
|
670 | f - record remaining changes to this file | |
649 | d - done, skip remaining changes and files |
|
671 | d - done, skip remaining changes and files | |
650 | a - record all changes to all remaining files |
|
672 | a - record all changes to all remaining files | |
651 | q - quit, recording no changes |
|
673 | q - quit, recording no changes | |
652 | ? - display help |
|
674 | ? - display help | |
653 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
675 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
654 | abort: user quit |
|
676 | abort: user quit | |
655 | [255] |
|
677 | [255] | |
656 |
|
678 | |||
657 | Skip |
|
679 | Skip | |
658 |
|
680 | |||
659 | $ hg record <<EOF |
|
681 | $ hg record <<EOF | |
660 | > s |
|
682 | > s | |
661 | > EOF |
|
683 | > EOF | |
662 | diff --git a/subdir/f1 b/subdir/f1 |
|
684 | diff --git a/subdir/f1 b/subdir/f1 | |
663 | 1 hunks, 1 lines changed |
|
685 | 1 hunks, 1 lines changed | |
664 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
686 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
665 | diff --git a/subdir/f2 b/subdir/f2 |
|
687 | diff --git a/subdir/f2 b/subdir/f2 | |
666 | 1 hunks, 1 lines changed |
|
688 | 1 hunks, 1 lines changed | |
667 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected |
|
689 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected | |
668 | [255] |
|
690 | [255] | |
669 |
|
691 | |||
670 | No |
|
692 | No | |
671 |
|
693 | |||
672 | $ hg record <<EOF |
|
694 | $ hg record <<EOF | |
673 | > n |
|
695 | > n | |
674 | > EOF |
|
696 | > EOF | |
675 | diff --git a/subdir/f1 b/subdir/f1 |
|
697 | diff --git a/subdir/f1 b/subdir/f1 | |
676 | 1 hunks, 1 lines changed |
|
698 | 1 hunks, 1 lines changed | |
677 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
699 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
678 | diff --git a/subdir/f2 b/subdir/f2 |
|
700 | diff --git a/subdir/f2 b/subdir/f2 | |
679 | 1 hunks, 1 lines changed |
|
701 | 1 hunks, 1 lines changed | |
680 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected |
|
702 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected | |
681 | [255] |
|
703 | [255] | |
682 |
|
704 | |||
683 | f, quit |
|
705 | f, quit | |
684 |
|
706 | |||
685 | $ hg record <<EOF |
|
707 | $ hg record <<EOF | |
686 | > f |
|
708 | > f | |
687 | > q |
|
709 | > q | |
688 | > EOF |
|
710 | > EOF | |
689 | diff --git a/subdir/f1 b/subdir/f1 |
|
711 | diff --git a/subdir/f1 b/subdir/f1 | |
690 | 1 hunks, 1 lines changed |
|
712 | 1 hunks, 1 lines changed | |
691 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
713 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
692 | diff --git a/subdir/f2 b/subdir/f2 |
|
714 | diff --git a/subdir/f2 b/subdir/f2 | |
693 | 1 hunks, 1 lines changed |
|
715 | 1 hunks, 1 lines changed | |
694 | examine changes to 'subdir/f2'? [Ynsfdaq?] |
|
716 | examine changes to 'subdir/f2'? [Ynsfdaq?] | |
695 | abort: user quit |
|
717 | abort: user quit | |
696 | [255] |
|
718 | [255] | |
697 |
|
719 | |||
698 | s, all |
|
720 | s, all | |
699 |
|
721 | |||
700 | $ hg record -d '18 0' -mx <<EOF |
|
722 | $ hg record -d '18 0' -mx <<EOF | |
701 | > s |
|
723 | > s | |
702 | > a |
|
724 | > a | |
703 | > EOF |
|
725 | > EOF | |
704 | diff --git a/subdir/f1 b/subdir/f1 |
|
726 | diff --git a/subdir/f1 b/subdir/f1 | |
705 | 1 hunks, 1 lines changed |
|
727 | 1 hunks, 1 lines changed | |
706 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
728 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
707 | diff --git a/subdir/f2 b/subdir/f2 |
|
729 | diff --git a/subdir/f2 b/subdir/f2 | |
708 | 1 hunks, 1 lines changed |
|
730 | 1 hunks, 1 lines changed | |
709 | examine changes to 'subdir/f2'? [Ynsfdaq?] |
|
731 | examine changes to 'subdir/f2'? [Ynsfdaq?] | |
710 |
|
732 | |||
711 | $ hg tip -p |
|
733 | $ hg tip -p | |
712 |
changeset: 20: |
|
734 | changeset: 20:b3df3dda369a | |
713 | tag: tip |
|
735 | tag: tip | |
714 | user: test |
|
736 | user: test | |
715 | date: Thu Jan 01 00:00:18 1970 +0000 |
|
737 | date: Thu Jan 01 00:00:18 1970 +0000 | |
716 | summary: x |
|
738 | summary: x | |
717 |
|
739 | |||
718 |
diff -r 2 |
|
740 | diff -r 6e02d6c9906d -r b3df3dda369a subdir/f2 | |
719 | --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000 |
|
741 | --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000 | |
720 | +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000 |
|
742 | +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000 | |
721 | @@ -1,1 +1,2 @@ |
|
743 | @@ -1,1 +1,2 @@ | |
722 | b |
|
744 | b | |
723 | +b |
|
745 | +b | |
724 |
|
746 | |||
725 |
|
747 | |||
726 | f |
|
748 | f | |
727 |
|
749 | |||
728 | $ hg record -d '19 0' -my <<EOF |
|
750 | $ hg record -d '19 0' -my <<EOF | |
729 | > f |
|
751 | > f | |
730 | > EOF |
|
752 | > EOF | |
731 | diff --git a/subdir/f1 b/subdir/f1 |
|
753 | diff --git a/subdir/f1 b/subdir/f1 | |
732 | 1 hunks, 1 lines changed |
|
754 | 1 hunks, 1 lines changed | |
733 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
755 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
734 |
|
756 | |||
735 | $ hg tip -p |
|
757 | $ hg tip -p | |
736 |
changeset: 21: |
|
758 | changeset: 21:38ec577f126b | |
737 | tag: tip |
|
759 | tag: tip | |
738 | user: test |
|
760 | user: test | |
739 | date: Thu Jan 01 00:00:19 1970 +0000 |
|
761 | date: Thu Jan 01 00:00:19 1970 +0000 | |
740 | summary: y |
|
762 | summary: y | |
741 |
|
763 | |||
742 |
diff -r |
|
764 | diff -r b3df3dda369a -r 38ec577f126b subdir/f1 | |
743 | --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000 |
|
765 | --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000 | |
744 | +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000 |
|
766 | +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000 | |
745 | @@ -1,1 +1,2 @@ |
|
767 | @@ -1,1 +1,2 @@ | |
746 | a |
|
768 | a | |
747 | +a |
|
769 | +a | |
748 |
|
770 | |||
749 |
|
771 | |||
750 | Preserve chmod +x |
|
772 | Preserve chmod +x | |
751 |
|
773 | |||
752 | $ chmod +x f1 |
|
774 | $ chmod +x f1 | |
753 | $ echo a >> f1 |
|
775 | $ echo a >> f1 | |
754 | $ hg record -d '20 0' -mz <<EOF |
|
776 | $ hg record -d '20 0' -mz <<EOF | |
755 | > y |
|
777 | > y | |
756 | > y |
|
778 | > y | |
757 | > y |
|
779 | > y | |
758 | > EOF |
|
780 | > EOF | |
759 | diff --git a/subdir/f1 b/subdir/f1 |
|
781 | diff --git a/subdir/f1 b/subdir/f1 | |
760 | old mode 100644 |
|
782 | old mode 100644 | |
761 | new mode 100755 |
|
783 | new mode 100755 | |
762 | 1 hunks, 1 lines changed |
|
784 | 1 hunks, 1 lines changed | |
763 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
785 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
764 | @@ -1,2 +1,3 @@ |
|
786 | @@ -1,2 +1,3 @@ | |
765 | a |
|
787 | a | |
766 | a |
|
788 | a | |
767 | +a |
|
789 | +a | |
768 | record this change to 'subdir/f1'? [Ynsfdaq?] |
|
790 | record this change to 'subdir/f1'? [Ynsfdaq?] | |
769 |
|
791 | |||
770 | $ hg tip --config diff.git=True -p |
|
792 | $ hg tip --config diff.git=True -p | |
771 |
changeset: 22: |
|
793 | changeset: 22:3261adceb075 | |
772 | tag: tip |
|
794 | tag: tip | |
773 | user: test |
|
795 | user: test | |
774 | date: Thu Jan 01 00:00:20 1970 +0000 |
|
796 | date: Thu Jan 01 00:00:20 1970 +0000 | |
775 | summary: z |
|
797 | summary: z | |
776 |
|
798 | |||
777 | diff --git a/subdir/f1 b/subdir/f1 |
|
799 | diff --git a/subdir/f1 b/subdir/f1 | |
778 | old mode 100644 |
|
800 | old mode 100644 | |
779 | new mode 100755 |
|
801 | new mode 100755 | |
780 | --- a/subdir/f1 |
|
802 | --- a/subdir/f1 | |
781 | +++ b/subdir/f1 |
|
803 | +++ b/subdir/f1 | |
782 | @@ -1,2 +1,3 @@ |
|
804 | @@ -1,2 +1,3 @@ | |
783 | a |
|
805 | a | |
784 | a |
|
806 | a | |
785 | +a |
|
807 | +a | |
786 |
|
808 | |||
787 |
|
809 | |||
788 | Preserve execute permission on original |
|
810 | Preserve execute permission on original | |
789 |
|
811 | |||
790 | $ echo b >> f1 |
|
812 | $ echo b >> f1 | |
791 | $ hg record -d '21 0' -maa <<EOF |
|
813 | $ hg record -d '21 0' -maa <<EOF | |
792 | > y |
|
814 | > y | |
793 | > y |
|
815 | > y | |
794 | > y |
|
816 | > y | |
795 | > EOF |
|
817 | > EOF | |
796 | diff --git a/subdir/f1 b/subdir/f1 |
|
818 | diff --git a/subdir/f1 b/subdir/f1 | |
797 | 1 hunks, 1 lines changed |
|
819 | 1 hunks, 1 lines changed | |
798 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
820 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
799 | @@ -1,3 +1,4 @@ |
|
821 | @@ -1,3 +1,4 @@ | |
800 | a |
|
822 | a | |
801 | a |
|
823 | a | |
802 | a |
|
824 | a | |
803 | +b |
|
825 | +b | |
804 | record this change to 'subdir/f1'? [Ynsfdaq?] |
|
826 | record this change to 'subdir/f1'? [Ynsfdaq?] | |
805 |
|
827 | |||
806 | $ hg tip --config diff.git=True -p |
|
828 | $ hg tip --config diff.git=True -p | |
807 |
changeset: 23: |
|
829 | changeset: 23:b429867550db | |
808 | tag: tip |
|
830 | tag: tip | |
809 | user: test |
|
831 | user: test | |
810 | date: Thu Jan 01 00:00:21 1970 +0000 |
|
832 | date: Thu Jan 01 00:00:21 1970 +0000 | |
811 | summary: aa |
|
833 | summary: aa | |
812 |
|
834 | |||
813 | diff --git a/subdir/f1 b/subdir/f1 |
|
835 | diff --git a/subdir/f1 b/subdir/f1 | |
814 | --- a/subdir/f1 |
|
836 | --- a/subdir/f1 | |
815 | +++ b/subdir/f1 |
|
837 | +++ b/subdir/f1 | |
816 | @@ -1,3 +1,4 @@ |
|
838 | @@ -1,3 +1,4 @@ | |
817 | a |
|
839 | a | |
818 | a |
|
840 | a | |
819 | a |
|
841 | a | |
820 | +b |
|
842 | +b | |
821 |
|
843 | |||
822 |
|
844 | |||
823 | Preserve chmod -x |
|
845 | Preserve chmod -x | |
824 |
|
846 | |||
825 | $ chmod -x f1 |
|
847 | $ chmod -x f1 | |
826 | $ echo c >> f1 |
|
848 | $ echo c >> f1 | |
827 | $ hg record -d '22 0' -mab <<EOF |
|
849 | $ hg record -d '22 0' -mab <<EOF | |
828 | > y |
|
850 | > y | |
829 | > y |
|
851 | > y | |
830 | > y |
|
852 | > y | |
831 | > EOF |
|
853 | > EOF | |
832 | diff --git a/subdir/f1 b/subdir/f1 |
|
854 | diff --git a/subdir/f1 b/subdir/f1 | |
833 | old mode 100755 |
|
855 | old mode 100755 | |
834 | new mode 100644 |
|
856 | new mode 100644 | |
835 | 1 hunks, 1 lines changed |
|
857 | 1 hunks, 1 lines changed | |
836 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
858 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
837 | @@ -2,3 +2,4 @@ |
|
859 | @@ -2,3 +2,4 @@ | |
838 | a |
|
860 | a | |
839 | a |
|
861 | a | |
840 | b |
|
862 | b | |
841 | +c |
|
863 | +c | |
842 | record this change to 'subdir/f1'? [Ynsfdaq?] |
|
864 | record this change to 'subdir/f1'? [Ynsfdaq?] | |
843 |
|
865 | |||
844 | $ hg tip --config diff.git=True -p |
|
866 | $ hg tip --config diff.git=True -p | |
845 |
changeset: 24: |
|
867 | changeset: 24:0b082130c20a | |
846 | tag: tip |
|
868 | tag: tip | |
847 | user: test |
|
869 | user: test | |
848 | date: Thu Jan 01 00:00:22 1970 +0000 |
|
870 | date: Thu Jan 01 00:00:22 1970 +0000 | |
849 | summary: ab |
|
871 | summary: ab | |
850 |
|
872 | |||
851 | diff --git a/subdir/f1 b/subdir/f1 |
|
873 | diff --git a/subdir/f1 b/subdir/f1 | |
852 | old mode 100755 |
|
874 | old mode 100755 | |
853 | new mode 100644 |
|
875 | new mode 100644 | |
854 | --- a/subdir/f1 |
|
876 | --- a/subdir/f1 | |
855 | +++ b/subdir/f1 |
|
877 | +++ b/subdir/f1 | |
856 | @@ -2,3 +2,4 @@ |
|
878 | @@ -2,3 +2,4 @@ | |
857 | a |
|
879 | a | |
858 | a |
|
880 | a | |
859 | b |
|
881 | b | |
860 | +c |
|
882 | +c | |
861 |
|
883 | |||
862 |
|
884 | |||
863 | $ cd .. |
|
885 | $ cd .. | |
864 |
|
886 | |||
865 | Abort early when a merge is in progress |
|
887 | Abort early when a merge is in progress | |
866 |
|
888 | |||
867 | $ hg up 4 |
|
889 | $ hg up 4 | |
868 |
1 files updated, 0 files merged, |
|
890 | 1 files updated, 0 files merged, 6 files removed, 0 files unresolved | |
869 |
|
891 | |||
870 | $ touch iwillmergethat |
|
892 | $ touch iwillmergethat | |
871 | $ hg add iwillmergethat |
|
893 | $ hg add iwillmergethat | |
872 |
|
894 | |||
873 | $ hg branch thatbranch |
|
895 | $ hg branch thatbranch | |
874 | marked working directory as branch thatbranch |
|
896 | marked working directory as branch thatbranch | |
875 |
|
897 | |||
876 | $ hg ci -m'new head' |
|
898 | $ hg ci -m'new head' | |
877 |
|
899 | |||
878 | $ hg up default |
|
900 | $ hg up default | |
879 |
|
|
901 | 6 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
880 |
|
902 | |||
881 | $ hg merge thatbranch |
|
903 | $ hg merge thatbranch | |
882 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
904 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
883 | (branch merge, don't forget to commit) |
|
905 | (branch merge, don't forget to commit) | |
884 |
|
906 | |||
885 | $ hg record -m'will abort' |
|
907 | $ hg record -m'will abort' | |
886 | abort: cannot partially commit a merge (use "hg commit" instead) |
|
908 | abort: cannot partially commit a merge (use "hg commit" instead) | |
887 | [255] |
|
909 | [255] | |
888 |
|
910 | |||
889 | $ hg up -C |
|
911 | $ hg up -C | |
890 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
912 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
891 |
|
913 | |||
892 | With win32text |
|
914 | With win32text | |
893 |
|
915 | |||
894 | $ echo '[extensions]' >> .hg/hgrc |
|
916 | $ echo '[extensions]' >> .hg/hgrc | |
895 | $ echo 'win32text = ' >> .hg/hgrc |
|
917 | $ echo 'win32text = ' >> .hg/hgrc | |
896 | $ echo '[decode]' >> .hg/hgrc |
|
918 | $ echo '[decode]' >> .hg/hgrc | |
897 | $ echo '** = cleverdecode:' >> .hg/hgrc |
|
919 | $ echo '** = cleverdecode:' >> .hg/hgrc | |
898 | $ echo '[encode]' >> .hg/hgrc |
|
920 | $ echo '[encode]' >> .hg/hgrc | |
899 | $ echo '** = cleverencode:' >> .hg/hgrc |
|
921 | $ echo '** = cleverencode:' >> .hg/hgrc | |
900 | $ echo '[patch]' >> .hg/hgrc |
|
922 | $ echo '[patch]' >> .hg/hgrc | |
901 | $ echo 'eol = crlf' >> .hg/hgrc |
|
923 | $ echo 'eol = crlf' >> .hg/hgrc | |
902 |
|
924 | |||
903 | Ignore win32text deprecation warning for now: |
|
925 | Ignore win32text deprecation warning for now: | |
904 |
|
926 | |||
905 | $ echo '[win32text]' >> .hg/hgrc |
|
927 | $ echo '[win32text]' >> .hg/hgrc | |
906 | $ echo 'warn = no' >> .hg/hgrc |
|
928 | $ echo 'warn = no' >> .hg/hgrc | |
907 |
|
929 | |||
908 | $ echo d >> subdir/f1 |
|
930 | $ echo d >> subdir/f1 | |
909 | $ hg record -d '23 0' -mw1 <<EOF |
|
931 | $ hg record -d '23 0' -mw1 <<EOF | |
910 | > y |
|
932 | > y | |
911 | > y |
|
933 | > y | |
912 | > EOF |
|
934 | > EOF | |
913 | diff --git a/subdir/f1 b/subdir/f1 |
|
935 | diff --git a/subdir/f1 b/subdir/f1 | |
914 | 1 hunks, 1 lines changed |
|
936 | 1 hunks, 1 lines changed | |
915 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
937 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
916 | @@ -3,3 +3,4 @@ |
|
938 | @@ -3,3 +3,4 @@ | |
917 | a |
|
939 | a | |
918 | b |
|
940 | b | |
919 | c |
|
941 | c | |
920 | +d |
|
942 | +d | |
921 | record this change to 'subdir/f1'? [Ynsfdaq?] |
|
943 | record this change to 'subdir/f1'? [Ynsfdaq?] | |
922 |
|
944 | |||
923 | $ hg tip -p |
|
945 | $ hg tip -p | |
924 |
changeset: 26: |
|
946 | changeset: 26:b8306e70edc4 | |
925 | tag: tip |
|
947 | tag: tip | |
926 |
parent: 24: |
|
948 | parent: 24:0b082130c20a | |
927 | user: test |
|
949 | user: test | |
928 | date: Thu Jan 01 00:00:23 1970 +0000 |
|
950 | date: Thu Jan 01 00:00:23 1970 +0000 | |
929 | summary: w1 |
|
951 | summary: w1 | |
930 |
|
952 | |||
931 |
diff -r |
|
953 | diff -r 0b082130c20a -r b8306e70edc4 subdir/f1 | |
932 | --- a/subdir/f1 Thu Jan 01 00:00:22 1970 +0000 |
|
954 | --- a/subdir/f1 Thu Jan 01 00:00:22 1970 +0000 | |
933 | +++ b/subdir/f1 Thu Jan 01 00:00:23 1970 +0000 |
|
955 | +++ b/subdir/f1 Thu Jan 01 00:00:23 1970 +0000 | |
934 | @@ -3,3 +3,4 @@ |
|
956 | @@ -3,3 +3,4 @@ | |
935 | a |
|
957 | a | |
936 | b |
|
958 | b | |
937 | c |
|
959 | c | |
938 | +d |
|
960 | +d | |
939 |
|
961 |
General Comments 0
You need to be logged in to leave comments.
Login now