##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Update test-record for 3ef190234b55
Brendan Cully -
r5286:cbec83d9 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -37,7 +37,7 b' use "hg -v help record" to show global o'
37 % select no files
37 % select no files
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 record changes to 'empty-rw'? [Ynsfdaq?] no changes to record
40 examine changes to 'empty-rw'? [Ynsfdaq?] no changes to record
41
41
42 changeset: -1:000000000000
42 changeset: -1:000000000000
43 tag: tip
43 tag: tip
@@ -48,7 +48,7 b' date: Thu Jan 01 00:00:00 1970 +0'
48 % select files but no hunks
48 % select files but no hunks
49 diff --git a/empty-rw b/empty-rw
49 diff --git a/empty-rw b/empty-rw
50 new file mode 100644
50 new file mode 100644
51 record changes to 'empty-rw'? [Ynsfdaq?] transaction abort!
51 examine changes to 'empty-rw'? [Ynsfdaq?] transaction abort!
52 rollback completed
52 rollback completed
53
53
54 changeset: -1:000000000000
54 changeset: -1:000000000000
@@ -60,7 +60,7 b' date: Thu Jan 01 00:00:00 1970 +0'
60 % record empty file
60 % record empty file
61 diff --git a/empty-rw b/empty-rw
61 diff --git a/empty-rw b/empty-rw
62 new file mode 100644
62 new file mode 100644
63 record changes to 'empty-rw'? [Ynsfdaq?]
63 examine changes to 'empty-rw'? [Ynsfdaq?]
64 changeset: 0:c0708cf4e46e
64 changeset: 0:c0708cf4e46e
65 tag: tip
65 tag: tip
66 user: test
66 user: test
@@ -72,7 +72,7 b' summary: empty'
72 diff --git a/empty-rw b/empty-rename
72 diff --git a/empty-rw b/empty-rename
73 rename from empty-rw
73 rename from empty-rw
74 rename to empty-rename
74 rename to empty-rename
75 record changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?]
75 examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?]
76 changeset: 1:df251d174da3
76 changeset: 1:df251d174da3
77 tag: tip
77 tag: tip
78 user: test
78 user: test
@@ -84,7 +84,7 b' summary: rename'
84 diff --git a/empty-rename b/empty-copy
84 diff --git a/empty-rename b/empty-copy
85 copy from empty-rename
85 copy from empty-rename
86 copy to empty-copy
86 copy to empty-copy
87 record changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?]
87 examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?]
88 changeset: 2:b63ea3939f8d
88 changeset: 2:b63ea3939f8d
89 tag: tip
89 tag: tip
90 user: test
90 user: test
@@ -95,7 +95,7 b' summary: copy'
95 % delete empty file
95 % delete empty file
96 diff --git a/empty-copy b/empty-copy
96 diff --git a/empty-copy b/empty-copy
97 deleted file mode 100644
97 deleted file mode 100644
98 record changes to 'empty-copy'? [Ynsfdaq?]
98 examine changes to 'empty-copy'? [Ynsfdaq?]
99 changeset: 3:a2546574bce9
99 changeset: 3:a2546574bce9
100 tag: tip
100 tag: tip
101 user: test
101 user: test
@@ -107,7 +107,7 b' summary: delete'
107 diff --git a/tip.bundle b/tip.bundle
107 diff --git a/tip.bundle b/tip.bundle
108 new file mode 100644
108 new file mode 100644
109 this is a binary file
109 this is a binary file
110 record changes to 'tip.bundle'? [Ynsfdaq?]
110 examine changes to 'tip.bundle'? [Ynsfdaq?]
111 changeset: 4:9e998a545a8b
111 changeset: 4:9e998a545a8b
112 tag: tip
112 tag: tip
113 user: test
113 user: test
@@ -120,7 +120,7 b' Binary file tip.bundle has changed'
120 % change binary file
120 % change binary file
121 diff --git a/tip.bundle b/tip.bundle
121 diff --git a/tip.bundle b/tip.bundle
122 this modifies a binary file (all or nothing)
122 this modifies a binary file (all or nothing)
123 record changes to 'tip.bundle'? [Ynsfdaq?]
123 examine changes to 'tip.bundle'? [Ynsfdaq?]
124 changeset: 5:93d05561507d
124 changeset: 5:93d05561507d
125 tag: tip
125 tag: tip
126 user: test
126 user: test
@@ -135,7 +135,7 b' diff --git a/tip.bundle b/top.bundle'
135 rename from tip.bundle
135 rename from tip.bundle
136 rename to top.bundle
136 rename to top.bundle
137 this modifies a binary file (all or nothing)
137 this modifies a binary file (all or nothing)
138 record changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?]
138 examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?]
139 changeset: 6:699cc1bea9aa
139 changeset: 6:699cc1bea9aa
140 tag: tip
140 tag: tip
141 user: test
141 user: test
@@ -150,7 +150,7 b' Binary file top.bundle has changed'
150 % add plain file
150 % add plain file
151 diff --git a/plain b/plain
151 diff --git a/plain b/plain
152 new file mode 100644
152 new file mode 100644
153 record changes to 'plain'? [Ynsfdaq?]
153 examine changes to 'plain'? [Ynsfdaq?]
154 changeset: 7:118ed744216b
154 changeset: 7:118ed744216b
155 tag: tip
155 tag: tip
156 user: test
156 user: test
@@ -175,7 +175,7 b' diff -r 699cc1bea9aa -r 118ed744216b pla'
175 % modify end of plain file
175 % modify end of plain file
176 diff --git a/plain b/plain
176 diff --git a/plain b/plain
177 1 hunks, 1 lines changed
177 1 hunks, 1 lines changed
178 record changes to 'plain'? [Ynsfdaq?] @@ -8,3 +8,4 @@ 8
178 examine changes to 'plain'? [Ynsfdaq?] @@ -8,3 +8,4 @@ 8
179 8
179 8
180 9
180 9
181 10
181 10
@@ -183,7 +183,7 b" record changes to 'plain'? [Ynsfdaq?] @"
183 record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, no EOL
183 record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, no EOL
184 diff --git a/plain b/plain
184 diff --git a/plain b/plain
185 1 hunks, 1 lines changed
185 1 hunks, 1 lines changed
186 record changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,4 @@ 9
186 examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,4 @@ 9
187 9
187 9
188 10
188 10
189 11
189 11
@@ -192,7 +192,7 b" record changes to 'plain'? [Ynsfdaq?] @"
192 record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, add EOL
192 record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, add EOL
193 diff --git a/plain b/plain
193 diff --git a/plain b/plain
194 1 hunks, 2 lines changed
194 1 hunks, 2 lines changed
195 record changes to 'plain'? [Ynsfdaq?] @@ -9,4 +9,4 @@ 9
195 examine changes to 'plain'? [Ynsfdaq?] @@ -9,4 +9,4 @@ 9
196 9
196 9
197 10
197 10
198 11
198 11
@@ -202,7 +202,7 b" record changes to 'plain'? [Ynsfdaq?] @"
202 record this change to 'plain'? [Ynsfdaq?] % modify beginning, trim end, record both
202 record this change to 'plain'? [Ynsfdaq?] % modify beginning, trim end, record both
203 diff --git a/plain b/plain
203 diff --git a/plain b/plain
204 2 hunks, 4 lines changed
204 2 hunks, 4 lines changed
205 record changes to 'plain'? [Ynsfdaq?] @@ -1,4 +1,4 @@ 1
205 examine changes to 'plain'? [Ynsfdaq?] @@ -1,4 +1,4 @@ 1
206 -1
206 -1
207 +2
207 +2
208 2
208 2
@@ -241,7 +241,7 b' diff -r e2ecd9b0b78d -r d09ab1967dab pla'
241 % record end
241 % record end
242 diff --git a/plain b/plain
242 diff --git a/plain b/plain
243 2 hunks, 5 lines changed
243 2 hunks, 5 lines changed
244 record changes to 'plain'? [Ynsfdaq?] @@ -1,9 +1,6 @@ 2
244 examine changes to 'plain'? [Ynsfdaq?] @@ -1,9 +1,6 @@ 2
245 -2
245 -2
246 -2
246 -2
247 -3
247 -3
@@ -280,7 +280,7 b' diff -r d09ab1967dab -r 44516c9708ae pla'
280 % record beginning
280 % record beginning
281 diff --git a/plain b/plain
281 diff --git a/plain b/plain
282 1 hunks, 3 lines changed
282 1 hunks, 3 lines changed
283 record changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,3 @@ 2
283 examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,3 @@ 2
284 -2
284 -2
285 -2
285 -2
286 -3
286 -3
@@ -309,7 +309,7 b' diff -r 44516c9708ae -r 3ebbace64a8d pla'
309 % record end
309 % record end
310 diff --git a/plain b/plain
310 diff --git a/plain b/plain
311 2 hunks, 4 lines changed
311 2 hunks, 4 lines changed
312 record changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,9 @@ 4
312 examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,9 @@ 4
313 +1
313 +1
314 +2
314 +2
315 +3
315 +3
@@ -331,7 +331,7 b" record this change to 'plain'? [Ynsfdaq?"
331 % record beginning, middle
331 % record beginning, middle
332 diff --git a/plain b/plain
332 diff --git a/plain b/plain
333 3 hunks, 7 lines changed
333 3 hunks, 7 lines changed
334 record changes to 'plain'? [Ynsfdaq?] @@ -1,2 +1,5 @@ 4
334 examine changes to 'plain'? [Ynsfdaq?] @@ -1,2 +1,5 @@ 4
335 +1
335 +1
336 +2
336 +2
337 +3
337 +3
@@ -378,7 +378,7 b' diff -r efc0dad7bd9f -r c1c639d8b268 pla'
378 % record end
378 % record end
379 diff --git a/plain b/plain
379 diff --git a/plain b/plain
380 1 hunks, 2 lines changed
380 1 hunks, 2 lines changed
381 record changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,5 @@ 7
381 examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,5 @@ 7
382 7
382 7
383 8
383 8
384 9
384 9
@@ -404,7 +404,7 b' diff -r c1c639d8b268 -r 80b74bbc7808 pla'
404 adding subdir/a
404 adding subdir/a
405 diff --git a/subdir/a b/subdir/a
405 diff --git a/subdir/a b/subdir/a
406 1 hunks, 1 lines changed
406 1 hunks, 1 lines changed
407 record changes to 'subdir/a'? [Ynsfdaq?] @@ -1,1 +1,2 @@ a
407 examine changes to 'subdir/a'? [Ynsfdaq?] @@ -1,1 +1,2 @@ a
408 a
408 a
409 +a
409 +a
410 record this change to 'subdir/a'? [Ynsfdaq?]
410 record this change to 'subdir/a'? [Ynsfdaq?]
@@ -424,7 +424,7 b' diff -r aecf2b2ea83c -r 33ff5c4fb017 sub'
424 % help, quit
424 % help, quit
425 diff --git a/subdir/f1 b/subdir/f1
425 diff --git a/subdir/f1 b/subdir/f1
426 1 hunks, 1 lines changed
426 1 hunks, 1 lines changed
427 record changes to 'subdir/f1'? [Ynsfdaq?] y - record this change
427 examine changes to 'subdir/f1'? [Ynsfdaq?] y - record this change
428 n - skip this change
428 n - skip this change
429 s - skip remaining changes to this file
429 s - skip remaining changes to this file
430 f - record remaining changes to this file
430 f - record remaining changes to this file
@@ -432,31 +432,31 b' d - done, skip remaining changes and fil'
432 a - record all changes to all remaining files
432 a - record all changes to all remaining files
433 q - quit, recording no changes
433 q - quit, recording no changes
434 ? - display help
434 ? - display help
435 record changes to 'subdir/f1'? [Ynsfdaq?] abort: user quit
435 examine changes to 'subdir/f1'? [Ynsfdaq?] abort: user quit
436 % skip
436 % skip
437 diff --git a/subdir/f1 b/subdir/f1
437 diff --git a/subdir/f1 b/subdir/f1
438 1 hunks, 1 lines changed
438 1 hunks, 1 lines changed
439 record changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
439 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
440 1 hunks, 1 lines changed
440 1 hunks, 1 lines changed
441 record changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
441 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
442 % no
442 % no
443 diff --git a/subdir/f1 b/subdir/f1
443 diff --git a/subdir/f1 b/subdir/f1
444 1 hunks, 1 lines changed
444 1 hunks, 1 lines changed
445 record changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
445 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
446 1 hunks, 1 lines changed
446 1 hunks, 1 lines changed
447 record changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
447 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
448 % f, quit
448 % f, quit
449 diff --git a/subdir/f1 b/subdir/f1
449 diff --git a/subdir/f1 b/subdir/f1
450 1 hunks, 1 lines changed
450 1 hunks, 1 lines changed
451 record changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
451 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
452 1 hunks, 1 lines changed
452 1 hunks, 1 lines changed
453 record changes to 'subdir/f2'? [Ynsfdaq?] abort: user quit
453 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: user quit
454 % s, all
454 % s, all
455 diff --git a/subdir/f1 b/subdir/f1
455 diff --git a/subdir/f1 b/subdir/f1
456 1 hunks, 1 lines changed
456 1 hunks, 1 lines changed
457 record changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
457 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
458 1 hunks, 1 lines changed
458 1 hunks, 1 lines changed
459 record changes to 'subdir/f2'? [Ynsfdaq?]
459 examine changes to 'subdir/f2'? [Ynsfdaq?]
460 changeset: 20:094183e04b7c
460 changeset: 20:094183e04b7c
461 tag: tip
461 tag: tip
462 user: test
462 user: test
@@ -473,7 +473,7 b' diff -r f9e855cd9374 -r 094183e04b7c sub'
473 % f
473 % f
474 diff --git a/subdir/f1 b/subdir/f1
474 diff --git a/subdir/f1 b/subdir/f1
475 1 hunks, 1 lines changed
475 1 hunks, 1 lines changed
476 record changes to 'subdir/f1'? [Ynsfdaq?]
476 examine changes to 'subdir/f1'? [Ynsfdaq?]
477 changeset: 21:38164785b0ef
477 changeset: 21:38164785b0ef
478 tag: tip
478 tag: tip
479 user: test
479 user: test
General Comments 0
You need to be logged in to leave comments. Login now