Show More
@@ -681,7 +681,11 b' class ui(object):' | |||
|
681 | 681 | try: |
|
682 | 682 | r = self._readline(self.label(msg, 'ui.prompt')) |
|
683 | 683 | if not r: |
|
684 |
r |
|
|
684 | r = default | |
|
685 | # sometimes self.interactive disagrees with isatty, | |
|
686 | # show default response | |
|
687 | if not util.isatty(self.fin): | |
|
688 | self.write(r, "\n") | |
|
685 | 689 | return r |
|
686 | 690 | except EOFError: |
|
687 | 691 | raise util.Abort(_('response expected')) |
@@ -85,7 +85,8 b' record' | |||
|
85 | 85 | \x1b[0;36;1mold mode 100644\x1b[0m (esc) |
|
86 | 86 | \x1b[0;36;1mnew mode 100755\x1b[0m (esc) |
|
87 | 87 | 1 hunks, 1 lines changed |
|
88 | \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m (esc) | |
|
88 | \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | |
|
89 | ||
|
89 | 90 | \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) |
|
90 | 91 | c |
|
91 | 92 | a |
@@ -95,7 +96,8 b' record' | |||
|
95 | 96 | a |
|
96 | 97 | a |
|
97 | 98 | c |
|
98 | \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m (esc) | |
|
99 | \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | |
|
100 | ||
|
99 | 101 | |
|
100 | 102 | $ echo "[extensions]" >> $HGRCPATH |
|
101 | 103 | $ echo "mq=" >> $HGRCPATH |
@@ -113,7 +115,8 b' qrecord' | |||
|
113 | 115 | \x1b[0;36;1mold mode 100644\x1b[0m (esc) |
|
114 | 116 | \x1b[0;36;1mnew mode 100755\x1b[0m (esc) |
|
115 | 117 | 1 hunks, 1 lines changed |
|
116 | \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m (esc) | |
|
118 | \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | |
|
119 | ||
|
117 | 120 | \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) |
|
118 | 121 | c |
|
119 | 122 | a |
@@ -123,7 +126,8 b' qrecord' | |||
|
123 | 126 | a |
|
124 | 127 | a |
|
125 | 128 | c |
|
126 | \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m (esc) | |
|
129 | \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | |
|
130 | ||
|
127 | 131 | |
|
128 | 132 | $ hg qpop -a |
|
129 | 133 | popping patch |
@@ -29,7 +29,8 b' Normal file in the working copy, keeping' | |||
|
29 | 29 | |
|
30 | 30 | $ echo "n" | hg merge --config ui.interactive=Yes |
|
31 | 31 | remote turned local normal file foo into a largefile |
|
32 |
use (l)argefile or keep (n)ormal file? |
|
|
32 | use (l)argefile or keep (n)ormal file? n | |
|
33 | getting changed largefiles | |
|
33 | 34 | 0 largefiles updated, 0 removed |
|
34 | 35 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
35 | 36 | (branch merge, don't forget to commit) |
@@ -43,7 +44,8 b' Normal file in the working copy, keeping' | |||
|
43 | 44 | $ hg update -q -C |
|
44 | 45 | $ echo "l" | hg merge --config ui.interactive=Yes |
|
45 | 46 | remote turned local normal file foo into a largefile |
|
46 |
use (l)argefile or keep (n)ormal file? |
|
|
47 | use (l)argefile or keep (n)ormal file? l | |
|
48 | getting changed largefiles | |
|
47 | 49 | 1 largefiles updated, 0 removed |
|
48 | 50 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
49 | 51 | (branch merge, don't forget to commit) |
@@ -71,7 +73,8 b' Largefile in the working copy, keeping t' | |||
|
71 | 73 | $ hg update -q -C -r 1 |
|
72 | 74 | $ echo "n" | hg merge --config ui.interactive=Yes |
|
73 | 75 | remote turned local largefile foo into a normal file |
|
74 |
keep (l)argefile or use (n)ormal file? |
|
|
76 | keep (l)argefile or use (n)ormal file? n | |
|
77 | getting changed largefiles | |
|
75 | 78 | 0 largefiles updated, 0 removed |
|
76 | 79 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
77 | 80 | (branch merge, don't forget to commit) |
@@ -99,7 +102,8 b' Largefile in the working copy, keeping t' | |||
|
99 | 102 | $ hg update -q -C -r 1 |
|
100 | 103 | $ echo "l" | hg merge --config ui.interactive=Yes |
|
101 | 104 | remote turned local largefile foo into a normal file |
|
102 |
keep (l)argefile or use (n)ormal file? |
|
|
105 | keep (l)argefile or use (n)ormal file? l | |
|
106 | getting changed largefiles | |
|
103 | 107 | 1 largefiles updated, 0 removed |
|
104 | 108 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
105 | 109 | (branch merge, don't forget to commit) |
@@ -243,8 +247,10 b' Ancestor: normal Parent: normal2 Paren' | |||
|
243 | 247 | $ hg up -Cqr normal2 |
|
244 | 248 | $ ( echo c; echo n ) | hg merge -r large --config ui.interactive=Yes |
|
245 | 249 | local changed f which remote deleted |
|
246 |
use (c)hanged version or (d)elete? |
|
|
247 | use (l)argefile or keep (n)ormal file? getting changed largefiles | |
|
250 | use (c)hanged version or (d)elete? c | |
|
251 | remote turned local normal file f into a largefile | |
|
252 | use (l)argefile or keep (n)ormal file? n | |
|
253 | getting changed largefiles | |
|
248 | 254 | 0 largefiles updated, 0 removed |
|
249 | 255 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
250 | 256 | (branch merge, don't forget to commit) |
@@ -254,7 +260,8 b' Ancestor: normal Parent: normal2 Paren' | |||
|
254 | 260 | $ hg up -Cqr normal2 |
|
255 | 261 | $ echo d | hg merge -r large --config ui.interactive=Yes |
|
256 | 262 | local changed f which remote deleted |
|
257 |
use (c)hanged version or (d)elete? |
|
|
263 | use (c)hanged version or (d)elete? d | |
|
264 | getting changed largefiles | |
|
258 | 265 | 1 largefiles updated, 0 removed |
|
259 | 266 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
260 | 267 | (branch merge, don't forget to commit) |
@@ -279,8 +286,10 b' swap' | |||
|
279 | 286 | $ hg up -Cqr large |
|
280 | 287 | $ ( echo c; echo n ) | hg merge -r normal2 --config ui.interactive=Yes |
|
281 | 288 | remote changed f which local deleted |
|
282 |
use (c)hanged version or leave (d)eleted? |
|
|
283 | keep (l)argefile or use (n)ormal file? getting changed largefiles | |
|
289 | use (c)hanged version or leave (d)eleted? c | |
|
290 | remote turned local largefile f into a normal file | |
|
291 | keep (l)argefile or use (n)ormal file? n | |
|
292 | getting changed largefiles | |
|
284 | 293 | 0 largefiles updated, 0 removed |
|
285 | 294 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
286 | 295 | (branch merge, don't forget to commit) |
@@ -290,7 +299,8 b' swap' | |||
|
290 | 299 | $ hg up -Cqr large |
|
291 | 300 | $ echo d | hg merge -r normal2 --config ui.interactive=Yes |
|
292 | 301 | remote changed f which local deleted |
|
293 |
use (c)hanged version or leave (d)eleted? |
|
|
302 | use (c)hanged version or leave (d)eleted? d | |
|
303 | getting changed largefiles | |
|
294 | 304 | 0 largefiles updated, 0 removed |
|
295 | 305 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
296 | 306 | (branch merge, don't forget to commit) |
@@ -336,7 +346,8 b' Ancestor: large Parent: large2 Paren' | |||
|
336 | 346 | $ hg up -Cqr large2 |
|
337 | 347 | $ echo d | hg merge -r normal --config ui.interactive=Yes |
|
338 | 348 | local changed .hglf/f which remote deleted |
|
339 |
use (c)hanged version or (d)elete? |
|
|
349 | use (c)hanged version or (d)elete? d | |
|
350 | getting changed largefiles | |
|
340 | 351 | 0 largefiles updated, 0 removed |
|
341 | 352 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
342 | 353 | (branch merge, don't forget to commit) |
@@ -361,7 +372,8 b' swap' | |||
|
361 | 372 | $ hg up -Cqr normal |
|
362 | 373 | $ echo d | hg merge -r large2 --config ui.interactive=Yes |
|
363 | 374 | remote changed .hglf/f which local deleted |
|
364 | use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
375 | use (c)hanged version or leave (d)eleted? d | |
|
376 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
365 | 377 | (branch merge, don't forget to commit) |
|
366 | 378 | $ cat f |
|
367 | 379 | normal |
@@ -343,18 +343,21 b' record chunk' | |||
|
343 | 343 | > EOF |
|
344 | 344 | diff --git a/a b/a |
|
345 | 345 | 2 hunks, 2 lines changed |
|
346 | examine changes to 'a'? [Ynesfdaq?] | |
|
346 | examine changes to 'a'? [Ynesfdaq?] y | |
|
347 | ||
|
347 | 348 | @@ -1,3 +1,4 @@ |
|
348 | 349 | expand $Id$ |
|
349 | 350 | +foo |
|
350 | 351 | do not process $Id: |
|
351 | 352 | xxx $ |
|
352 | record change 1/2 to 'a'? [Ynesfdaq?] | |
|
353 | record change 1/2 to 'a'? [Ynesfdaq?] y | |
|
354 | ||
|
353 | 355 | @@ -2,2 +3,3 @@ |
|
354 | 356 | do not process $Id: |
|
355 | 357 | xxx $ |
|
356 | 358 | +bar |
|
357 | record change 2/2 to 'a'? [Ynesfdaq?] | |
|
359 | record change 2/2 to 'a'? [Ynesfdaq?] n | |
|
360 | ||
|
358 | 361 | |
|
359 | 362 | $ hg identify |
|
360 | 363 | 5f5eb23505c3+ tip |
@@ -400,18 +403,21 b' Record all chunks in file a' | |||
|
400 | 403 | > EOF |
|
401 | 404 | diff --git a/a b/a |
|
402 | 405 | 2 hunks, 2 lines changed |
|
403 | examine changes to 'a'? [Ynesfdaq?] | |
|
406 | examine changes to 'a'? [Ynesfdaq?] y | |
|
407 | ||
|
404 | 408 | @@ -1,3 +1,4 @@ |
|
405 | 409 | expand $Id$ |
|
406 | 410 | +foo |
|
407 | 411 | do not process $Id: |
|
408 | 412 | xxx $ |
|
409 | record change 1/2 to 'a'? [Ynesfdaq?] | |
|
413 | record change 1/2 to 'a'? [Ynesfdaq?] y | |
|
414 | ||
|
410 | 415 | @@ -2,2 +3,3 @@ |
|
411 | 416 | do not process $Id: |
|
412 | 417 | xxx $ |
|
413 | 418 | +bar |
|
414 | record change 2/2 to 'a'? [Ynesfdaq?] | |
|
419 | record change 2/2 to 'a'? [Ynesfdaq?] y | |
|
420 | ||
|
415 | 421 | |
|
416 | 422 | File a should be clean |
|
417 | 423 | |
@@ -467,7 +473,8 b' record added file alone' | |||
|
467 | 473 | > EOF |
|
468 | 474 | diff --git a/r b/r |
|
469 | 475 | new file mode 100644 |
|
470 | examine changes to 'r'? [Ynesfdaq?] | |
|
476 | examine changes to 'r'? [Ynesfdaq?] y | |
|
477 | ||
|
471 | 478 | r |
|
472 | 479 | committed changeset 3:82a2f715724d |
|
473 | 480 | overwriting r expanding keywords |
@@ -491,7 +498,8 b' record added keyword ignored file' | |||
|
491 | 498 | > EOF |
|
492 | 499 | diff --git a/i b/i |
|
493 | 500 | new file mode 100644 |
|
494 | examine changes to 'i'? [Ynesfdaq?] | |
|
501 | examine changes to 'i'? [Ynesfdaq?] y | |
|
502 | ||
|
495 | 503 | i |
|
496 | 504 | committed changeset 3:9f40ceb5a072 |
|
497 | 505 | $ cat i |
@@ -64,7 +64,8 b' Test that "hg merge" updates largefiles ' | |||
|
64 | 64 | largefile large1 has a merge conflict |
|
65 | 65 | ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
|
66 | 66 | keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
|
67 |
take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? |
|
|
67 | take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o | |
|
68 | merging normal1 | |
|
68 | 69 | warning: conflicts during merge. |
|
69 | 70 | merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
70 | 71 | getting changed largefiles |
@@ -249,7 +250,8 b' Test that linear merge can detect modifi' | |||
|
249 | 250 | largefile large1 has a merge conflict |
|
250 | 251 | ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
|
251 | 252 | keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
|
252 |
take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? |
|
|
253 | take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? o | |
|
254 | getting changed largefiles | |
|
253 | 255 | 1 largefiles updated, 0 removed |
|
254 | 256 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
255 | 257 | $ hg status -A large1 |
@@ -432,14 +434,19 b' Test that the internal linear merging wo' | |||
|
432 | 434 | > l |
|
433 | 435 | > EOF |
|
434 | 436 | subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9) |
|
435 | (M)erge, keep (l)ocal or keep (r)emote? subrepository sources for sub differ (in checked out version) | |
|
437 | (M)erge, keep (l)ocal or keep (r)emote? m | |
|
438 | subrepository sources for sub differ (in checked out version) | |
|
436 | 439 | use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? |
|
437 | local changed .hglf/large2 which remote deleted | |
|
438 | use (c)hanged version or (d)elete? remote turned local largefile large2 into a normal file | |
|
439 | keep (l)argefile or use (n)ormal file? largefile large1 has a merge conflict | |
|
440 | r | |
|
441 | local changed .hglf/large2 which remote deleted | |
|
442 | use (c)hanged version or (d)elete? c | |
|
443 | remote turned local largefile large2 into a normal file | |
|
444 | keep (l)argefile or use (n)ormal file? l | |
|
445 | largefile large1 has a merge conflict | |
|
440 | 446 | ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
|
441 | 447 | keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
|
442 |
take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? |
|
|
448 | take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l | |
|
449 | 2 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
|
443 | 450 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
444 | 451 | |
|
445 | 452 | $ hg -R sub status -A sub/large1 |
@@ -472,7 +479,8 b' it is aborted by conflict.' | |||
|
472 | 479 | largefile large1 has a merge conflict |
|
473 | 480 | ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
|
474 | 481 | keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
|
475 |
take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? |
|
|
482 | take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o | |
|
483 | merging normal1 | |
|
476 | 484 | warning: conflicts during merge. |
|
477 | 485 | merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
478 | 486 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
@@ -71,8 +71,10 b' Interactive merge:' | |||
|
71 | 71 | > d |
|
72 | 72 | > EOF |
|
73 | 73 | local changed file1 which remote deleted |
|
74 |
use (c)hanged version or (d)elete? |
|
|
75 | use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
74 | use (c)hanged version or (d)elete? c | |
|
75 | remote changed file2 which local deleted | |
|
76 | use (c)hanged version or leave (d)eleted? d | |
|
77 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
76 | 78 | (branch merge, don't forget to commit) |
|
77 | 79 | |
|
78 | 80 | $ status |
@@ -98,14 +100,19 b' Interactive merge with bad input:' | |||
|
98 | 100 | > c |
|
99 | 101 | > EOF |
|
100 | 102 | local changed file1 which remote deleted |
|
101 |
use (c)hanged version or (d)elete? |
|
|
103 | use (c)hanged version or (d)elete? foo | |
|
104 | unrecognized response | |
|
102 | 105 | local changed file1 which remote deleted |
|
103 |
use (c)hanged version or (d)elete? |
|
|
106 | use (c)hanged version or (d)elete? bar | |
|
107 | unrecognized response | |
|
104 | 108 | local changed file1 which remote deleted |
|
105 |
use (c)hanged version or (d)elete? |
|
|
106 | use (c)hanged version or leave (d)eleted? unrecognized response | |
|
109 | use (c)hanged version or (d)elete? d | |
|
107 | 110 |
|
|
108 | use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
111 | use (c)hanged version or leave (d)eleted? baz | |
|
112 | unrecognized response | |
|
113 | remote changed file2 which local deleted | |
|
114 | use (c)hanged version or leave (d)eleted? c | |
|
115 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
109 | 116 | (branch merge, don't forget to commit) |
|
110 | 117 | |
|
111 | 118 | $ status |
@@ -127,7 +134,8 b' Interactive merge with not enough input:' | |||
|
127 | 134 | > d |
|
128 | 135 | > EOF |
|
129 | 136 | local changed file1 which remote deleted |
|
130 |
use (c)hanged version or (d)elete? |
|
|
137 | use (c)hanged version or (d)elete? d | |
|
138 | remote changed file2 which local deleted | |
|
131 | 139 | use (c)hanged version or leave (d)eleted? abort: response expected |
|
132 | 140 | [255] |
|
133 | 141 |
@@ -181,22 +181,26 b' partial qrefresh' | |||
|
181 | 181 | > EOF |
|
182 | 182 | diff --git a/1.txt b/1.txt |
|
183 | 183 | 2 hunks, 2 lines changed |
|
184 | examine changes to '1.txt'? [Ynesfdaq?] | |
|
184 | examine changes to '1.txt'? [Ynesfdaq?] y | |
|
185 | ||
|
185 | 186 | @@ -1,3 +1,3 @@ |
|
186 | 187 | 1 |
|
187 | 188 | -2 |
|
188 | 189 | +2 2 |
|
189 | 190 | 3 |
|
190 | record change 1/4 to '1.txt'? [Ynesfdaq?] | |
|
191 | record change 1/4 to '1.txt'? [Ynesfdaq?] y | |
|
192 | ||
|
191 | 193 | @@ -3,3 +3,3 @@ |
|
192 | 194 | 3 |
|
193 | 195 | -4 |
|
194 | 196 | +4 4 |
|
195 | 197 | 5 |
|
196 | record change 2/4 to '1.txt'? [Ynesfdaq?] | |
|
198 | record change 2/4 to '1.txt'? [Ynesfdaq?] n | |
|
199 | ||
|
197 | 200 | diff --git a/2.txt b/2.txt |
|
198 | 201 | 1 hunks, 1 lines changed |
|
199 | examine changes to '2.txt'? [Ynesfdaq?] | |
|
202 | examine changes to '2.txt'? [Ynesfdaq?] y | |
|
203 | ||
|
200 | 204 | @@ -1,5 +1,5 @@ |
|
201 | 205 | a |
|
202 | 206 | -b |
@@ -204,10 +208,12 b' partial qrefresh' | |||
|
204 | 208 | c |
|
205 | 209 | d |
|
206 | 210 | e |
|
207 | record change 3/4 to '2.txt'? [Ynesfdaq?] | |
|
211 | record change 3/4 to '2.txt'? [Ynesfdaq?] y | |
|
212 | ||
|
208 | 213 | diff --git a/dir/a.txt b/dir/a.txt |
|
209 | 214 | 1 hunks, 1 lines changed |
|
210 | examine changes to 'dir/a.txt'? [Ynesfdaq?] | |
|
215 | examine changes to 'dir/a.txt'? [Ynesfdaq?] n | |
|
216 | ||
|
211 | 217 | |
|
212 | 218 | After partial qrefresh 'tip' |
|
213 | 219 | |
@@ -275,7 +281,8 b' qrefresh interactively everything else' | |||
|
275 | 281 | > EOF |
|
276 | 282 | diff --git a/1.txt b/1.txt |
|
277 | 283 | 1 hunks, 1 lines changed |
|
278 | examine changes to '1.txt'? [Ynesfdaq?] | |
|
284 | examine changes to '1.txt'? [Ynesfdaq?] y | |
|
285 | ||
|
279 | 286 | @@ -1,5 +1,5 @@ |
|
280 | 287 | 1 |
|
281 | 288 | 2 2 |
@@ -283,17 +290,20 b' qrefresh interactively everything else' | |||
|
283 | 290 | -4 |
|
284 | 291 | +4 4 |
|
285 | 292 | 5 |
|
286 | record change 1/2 to '1.txt'? [Ynesfdaq?] | |
|
293 | record change 1/2 to '1.txt'? [Ynesfdaq?] y | |
|
294 | ||
|
287 | 295 | diff --git a/dir/a.txt b/dir/a.txt |
|
288 | 296 | 1 hunks, 1 lines changed |
|
289 | examine changes to 'dir/a.txt'? [Ynesfdaq?] | |
|
297 | examine changes to 'dir/a.txt'? [Ynesfdaq?] y | |
|
298 | ||
|
290 | 299 | @@ -1,4 +1,4 @@ |
|
291 | 300 | -hello world |
|
292 | 301 | +hello world! |
|
293 | 302 | |
|
294 | 303 | someone |
|
295 | 304 | up |
|
296 | record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] | |
|
305 | record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y | |
|
306 | ||
|
297 | 307 | |
|
298 | 308 | After final qrefresh 'tip' |
|
299 | 309 |
@@ -291,7 +291,8 b' handle subrepos safely on qrecord' | |||
|
291 | 291 | % qrecord --config ui.interactive=1 -m0 0.diff |
|
292 | 292 | diff --git a/.hgsub b/.hgsub |
|
293 | 293 | new file mode 100644 |
|
294 | examine changes to '.hgsub'? [Ynesfdaq?] | |
|
294 | examine changes to '.hgsub'? [Ynesfdaq?] y | |
|
295 | ||
|
295 | 296 | abort: uncommitted changes in subrepository sub |
|
296 | 297 | [255] |
|
297 | 298 | % update substate when adding .hgsub w/clean updated subrepo |
@@ -299,7 +300,8 b' handle subrepos safely on qrecord' | |||
|
299 | 300 | % qrecord --config ui.interactive=1 -m0 0.diff |
|
300 | 301 | diff --git a/.hgsub b/.hgsub |
|
301 | 302 | new file mode 100644 |
|
302 | examine changes to '.hgsub'? [Ynesfdaq?] | |
|
303 | examine changes to '.hgsub'? [Ynesfdaq?] y | |
|
304 | ||
|
303 | 305 | path sub |
|
304 | 306 | source sub |
|
305 | 307 | revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 |
@@ -315,11 +317,13 b' handle subrepos safely on qrecord' | |||
|
315 | 317 | % qrecord --config ui.interactive=1 -m1 1.diff |
|
316 | 318 | diff --git a/.hgsub b/.hgsub |
|
317 | 319 | 1 hunks, 1 lines changed |
|
318 | examine changes to '.hgsub'? [Ynesfdaq?] | |
|
320 | examine changes to '.hgsub'? [Ynesfdaq?] y | |
|
321 | ||
|
319 | 322 | @@ -1,1 +1,2 @@ |
|
320 | 323 | sub = sub |
|
321 | 324 | +sub2 = sub2 |
|
322 | record this change to '.hgsub'? [Ynesfdaq?] | |
|
325 | record this change to '.hgsub'? [Ynesfdaq?] y | |
|
326 | ||
|
323 | 327 | abort: uncommitted changes in subrepository sub2 |
|
324 | 328 | [255] |
|
325 | 329 | % update substate when modifying .hgsub w/clean updated subrepo |
@@ -327,11 +331,13 b' handle subrepos safely on qrecord' | |||
|
327 | 331 | % qrecord --config ui.interactive=1 -m1 1.diff |
|
328 | 332 | diff --git a/.hgsub b/.hgsub |
|
329 | 333 | 1 hunks, 1 lines changed |
|
330 | examine changes to '.hgsub'? [Ynesfdaq?] | |
|
334 | examine changes to '.hgsub'? [Ynesfdaq?] y | |
|
335 | ||
|
331 | 336 | @@ -1,1 +1,2 @@ |
|
332 | 337 | sub = sub |
|
333 | 338 | +sub2 = sub2 |
|
334 | record this change to '.hgsub'? [Ynesfdaq?] | |
|
339 | record this change to '.hgsub'? [Ynesfdaq?] y | |
|
340 | ||
|
335 | 341 | path sub |
|
336 | 342 | source sub |
|
337 | 343 | revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 |
@@ -352,7 +358,8 b' handle subrepos safely on qrecord' | |||
|
352 | 358 | % qrecord --config ui.interactive=1 -m2 2.diff |
|
353 | 359 | diff --git a/.hgsub b/.hgsub |
|
354 | 360 | deleted file mode 100644 |
|
355 | examine changes to '.hgsub'? [Ynesfdaq?] | |
|
361 | examine changes to '.hgsub'? [Ynesfdaq?] y | |
|
362 | ||
|
356 | 363 | % debugsub should be empty |
|
357 | 364 | |
|
358 | 365 | $ hg qpop -qa |
@@ -367,7 +374,8 b' handle subrepos safely on qrecord' | |||
|
367 | 374 | % qrecord --config ui.interactive=1 -m3 3.diff |
|
368 | 375 | diff --git a/.hgsub b/.hgsub |
|
369 | 376 | deleted file mode 100644 |
|
370 | examine changes to '.hgsub'? [Ynesfdaq?] | |
|
377 | examine changes to '.hgsub'? [Ynesfdaq?] y | |
|
378 | ||
|
371 | 379 | % debugsub should be empty |
|
372 | 380 | |
|
373 | 381 | $ cd .. |
@@ -82,7 +82,8 b' Mercurial-patchbomb/.* -> Mercurial-patc' | |||
|
82 | 82 | a | 1 + |
|
83 | 83 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
84 | 84 | |
|
85 |
are you sure you want to send (yn)? |
|
|
85 | are you sure you want to send (yn)? n | |
|
86 | abort: patchbomb canceled | |
|
86 | 87 | [255] |
|
87 | 88 | |
|
88 | 89 | $ echo b > b |
@@ -246,22 +246,26 b' qrecord a.patch' | |||
|
246 | 246 | > EOF |
|
247 | 247 | diff --git a/1.txt b/1.txt |
|
248 | 248 | 2 hunks, 2 lines changed |
|
249 | examine changes to '1.txt'? [Ynesfdaq?] | |
|
249 | examine changes to '1.txt'? [Ynesfdaq?] y | |
|
250 | ||
|
250 | 251 | @@ -1,3 +1,3 @@ |
|
251 | 252 | 1 |
|
252 | 253 | -2 |
|
253 | 254 | +2 2 |
|
254 | 255 | 3 |
|
255 | record change 1/4 to '1.txt'? [Ynesfdaq?] | |
|
256 | record change 1/4 to '1.txt'? [Ynesfdaq?] y | |
|
257 | ||
|
256 | 258 | @@ -3,3 +3,3 @@ |
|
257 | 259 | 3 |
|
258 | 260 | -4 |
|
259 | 261 | +4 4 |
|
260 | 262 | 5 |
|
261 | record change 2/4 to '1.txt'? [Ynesfdaq?] | |
|
263 | record change 2/4 to '1.txt'? [Ynesfdaq?] n | |
|
264 | ||
|
262 | 265 | diff --git a/2.txt b/2.txt |
|
263 | 266 | 1 hunks, 1 lines changed |
|
264 | examine changes to '2.txt'? [Ynesfdaq?] | |
|
267 | examine changes to '2.txt'? [Ynesfdaq?] y | |
|
268 | ||
|
265 | 269 | @@ -1,5 +1,5 @@ |
|
266 | 270 | a |
|
267 | 271 | -b |
@@ -269,10 +273,12 b' qrecord a.patch' | |||
|
269 | 273 | c |
|
270 | 274 | d |
|
271 | 275 | e |
|
272 | record change 3/4 to '2.txt'? [Ynesfdaq?] | |
|
276 | record change 3/4 to '2.txt'? [Ynesfdaq?] y | |
|
277 | ||
|
273 | 278 | diff --git a/dir/a.txt b/dir/a.txt |
|
274 | 279 | 1 hunks, 1 lines changed |
|
275 | examine changes to 'dir/a.txt'? [Ynesfdaq?] | |
|
280 | examine changes to 'dir/a.txt'? [Ynesfdaq?] n | |
|
281 | ||
|
276 | 282 | |
|
277 | 283 | After qrecord a.patch 'tip'" |
|
278 | 284 | |
@@ -341,7 +347,8 b' qrecord b.patch' | |||
|
341 | 347 | > EOF |
|
342 | 348 | diff --git a/1.txt b/1.txt |
|
343 | 349 | 1 hunks, 1 lines changed |
|
344 | examine changes to '1.txt'? [Ynesfdaq?] | |
|
350 | examine changes to '1.txt'? [Ynesfdaq?] y | |
|
351 | ||
|
345 | 352 | @@ -1,5 +1,5 @@ |
|
346 | 353 | 1 |
|
347 | 354 | 2 2 |
@@ -349,17 +356,20 b' qrecord b.patch' | |||
|
349 | 356 | -4 |
|
350 | 357 | +4 4 |
|
351 | 358 | 5 |
|
352 | record change 1/2 to '1.txt'? [Ynesfdaq?] | |
|
359 | record change 1/2 to '1.txt'? [Ynesfdaq?] y | |
|
360 | ||
|
353 | 361 | diff --git a/dir/a.txt b/dir/a.txt |
|
354 | 362 | 1 hunks, 1 lines changed |
|
355 | examine changes to 'dir/a.txt'? [Ynesfdaq?] | |
|
363 | examine changes to 'dir/a.txt'? [Ynesfdaq?] y | |
|
364 | ||
|
356 | 365 | @@ -1,4 +1,4 @@ |
|
357 | 366 | -hello world |
|
358 | 367 | +hello world! |
|
359 | 368 | |
|
360 | 369 | someone |
|
361 | 370 | up |
|
362 | record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] | |
|
371 | record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y | |
|
372 | ||
|
363 | 373 | |
|
364 | 374 | After qrecord b.patch 'tip' |
|
365 | 375 |
@@ -18,7 +18,8 b' Select no files' | |||
|
18 | 18 | > EOF |
|
19 | 19 | diff --git a/empty-rw b/empty-rw |
|
20 | 20 | new file mode 100644 |
|
21 | examine changes to 'empty-rw'? [Ynesfdaq?] | |
|
21 | examine changes to 'empty-rw'? [Ynesfdaq?] n | |
|
22 | ||
|
22 | 23 | no changes to record |
|
23 | 24 | |
|
24 | 25 | $ hg tip -p |
@@ -37,7 +38,8 b' Select files but no hunks' | |||
|
37 | 38 | > EOF |
|
38 | 39 | diff --git a/empty-rw b/empty-rw |
|
39 | 40 | new file mode 100644 |
|
40 | examine changes to 'empty-rw'? [Ynesfdaq?] | |
|
41 | examine changes to 'empty-rw'? [Ynesfdaq?] y | |
|
42 | ||
|
41 | 43 | abort: empty commit message |
|
42 | 44 | [255] |
|
43 | 45 | |
@@ -57,7 +59,8 b' Record empty file' | |||
|
57 | 59 | > EOF |
|
58 | 60 | diff --git a/empty-rw b/empty-rw |
|
59 | 61 | new file mode 100644 |
|
60 | examine changes to 'empty-rw'? [Ynesfdaq?] | |
|
62 | examine changes to 'empty-rw'? [Ynesfdaq?] y | |
|
63 | ||
|
61 | 64 | |
|
62 | 65 | $ hg tip -p |
|
63 | 66 | changeset: 0:c0708cf4e46e |
@@ -86,7 +89,8 b' Rename empty file' | |||
|
86 | 89 | diff --git a/empty-rw b/empty-rename |
|
87 | 90 | rename from empty-rw |
|
88 | 91 | rename to empty-rename |
|
89 | examine changes to 'empty-rw' and 'empty-rename'? [Ynesfdaq?] | |
|
92 | examine changes to 'empty-rw' and 'empty-rename'? [Ynesfdaq?] y | |
|
93 | ||
|
90 | 94 | |
|
91 | 95 | $ hg tip -p |
|
92 | 96 | changeset: 1:d695e8dcb197 |
@@ -106,7 +110,8 b' Copy empty file' | |||
|
106 | 110 | diff --git a/empty-rename b/empty-copy |
|
107 | 111 | copy from empty-rename |
|
108 | 112 | copy to empty-copy |
|
109 | examine changes to 'empty-rename' and 'empty-copy'? [Ynesfdaq?] | |
|
113 | examine changes to 'empty-rename' and 'empty-copy'? [Ynesfdaq?] y | |
|
114 | ||
|
110 | 115 | |
|
111 | 116 | $ hg tip -p |
|
112 | 117 | changeset: 2:1d4b90bea524 |
@@ -125,7 +130,8 b' Delete empty file' | |||
|
125 | 130 | > EOF |
|
126 | 131 | diff --git a/empty-copy b/empty-copy |
|
127 | 132 | deleted file mode 100644 |
|
128 | examine changes to 'empty-copy'? [Ynesfdaq?] | |
|
133 | examine changes to 'empty-copy'? [Ynesfdaq?] y | |
|
134 | ||
|
129 | 135 | |
|
130 | 136 | $ hg tip -p |
|
131 | 137 | changeset: 3:b39a238f01a1 |
@@ -147,7 +153,8 b' Add binary file' | |||
|
147 | 153 | diff --git a/tip.bundle b/tip.bundle |
|
148 | 154 | new file mode 100644 |
|
149 | 155 | this is a binary file |
|
150 | examine changes to 'tip.bundle'? [Ynesfdaq?] | |
|
156 | examine changes to 'tip.bundle'? [Ynesfdaq?] y | |
|
157 | ||
|
151 | 158 | |
|
152 | 159 | $ hg tip -p |
|
153 | 160 | changeset: 4:ad816da3711e |
@@ -169,7 +176,8 b' Change binary file' | |||
|
169 | 176 | > EOF |
|
170 | 177 | diff --git a/tip.bundle b/tip.bundle |
|
171 | 178 | this modifies a binary file (all or nothing) |
|
172 | examine changes to 'tip.bundle'? [Ynesfdaq?] | |
|
179 | examine changes to 'tip.bundle'? [Ynesfdaq?] y | |
|
180 | ||
|
173 | 181 | |
|
174 | 182 | $ hg tip -p |
|
175 | 183 | changeset: 5:dccd6f3eb485 |
@@ -194,7 +202,8 b' Rename and change binary file' | |||
|
194 | 202 | rename from tip.bundle |
|
195 | 203 | rename to top.bundle |
|
196 | 204 | this modifies a binary file (all or nothing) |
|
197 | examine changes to 'tip.bundle' and 'top.bundle'? [Ynesfdaq?] | |
|
205 | examine changes to 'tip.bundle' and 'top.bundle'? [Ynesfdaq?] y | |
|
206 | ||
|
198 | 207 | |
|
199 | 208 | $ hg tip -p |
|
200 | 209 | changeset: 6:7fa44105f5b3 |
@@ -222,7 +231,8 b' Add plain file' | |||
|
222 | 231 | > EOF |
|
223 | 232 | diff --git a/plain b/plain |
|
224 | 233 | new file mode 100644 |
|
225 | examine changes to 'plain'? [Ynesfdaq?] | |
|
234 | examine changes to 'plain'? [Ynesfdaq?] y | |
|
235 | ||
|
226 | 236 | |
|
227 | 237 | $ hg tip -p |
|
228 | 238 | changeset: 7:11fb457c1be4 |
@@ -266,13 +276,15 b' Modify end of plain file, also test that' | |||
|
266 | 276 | > EOF |
|
267 | 277 | diff --git a/plain b/plain |
|
268 | 278 | 1 hunks, 1 lines changed |
|
269 | examine changes to 'plain'? [Ynesfdaq?] | |
|
279 | examine changes to 'plain'? [Ynesfdaq?] y | |
|
280 | ||
|
270 | 281 | @@ -8,3 +8,4 @@ 7 |
|
271 | 282 | 8 |
|
272 | 283 | 9 |
|
273 | 284 | 10 |
|
274 | 285 | +11 |
|
275 | record this change to 'plain'? [Ynesfdaq?] | |
|
286 | record this change to 'plain'? [Ynesfdaq?] y | |
|
287 | ||
|
276 | 288 | |
|
277 | 289 |
Modify |
|
278 | 290 | |
@@ -283,14 +295,16 b' Modify end of plain file, no EOL' | |||
|
283 | 295 | > EOF |
|
284 | 296 | diff --git a/plain b/plain |
|
285 | 297 | 1 hunks, 1 lines changed |
|
286 | examine changes to 'plain'? [Ynesfdaq?] | |
|
298 | examine changes to 'plain'? [Ynesfdaq?] y | |
|
299 | ||
|
287 | 300 | @@ -9,3 +9,4 @@ |
|
288 | 301 | 9 |
|
289 | 302 | 10 |
|
290 | 303 | 11 |
|
291 | 304 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
292 | 305 | \ No newline at end of file |
|
293 | record this change to 'plain'? [Ynesfdaq?] | |
|
306 | record this change to 'plain'? [Ynesfdaq?] y | |
|
307 | ||
|
294 | 308 | |
|
295 | 309 | Modify end of plain file, add EOL |
|
296 | 310 | |
@@ -304,7 +318,8 b' Modify end of plain file, add EOL' | |||
|
304 | 318 | > EOF |
|
305 | 319 | diff --git a/plain b/plain |
|
306 | 320 | 1 hunks, 1 lines changed |
|
307 | examine changes to 'plain'? [Ynesfdaq?] | |
|
321 | examine changes to 'plain'? [Ynesfdaq?] y | |
|
322 | ||
|
308 | 323 | @@ -9,4 +9,4 @@ |
|
309 | 324 | 9 |
|
310 | 325 | 10 |
@@ -312,10 +327,12 b' Modify end of plain file, add EOL' | |||
|
312 | 327 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
313 | 328 | \ No newline at end of file |
|
314 | 329 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
315 | record change 1/2 to 'plain'? [Ynesfdaq?] | |
|
330 | record change 1/2 to 'plain'? [Ynesfdaq?] y | |
|
331 | ||
|
316 | 332 | diff --git a/plain2 b/plain2 |
|
317 | 333 | new file mode 100644 |
|
318 | examine changes to 'plain2'? [Ynesfdaq?] | |
|
334 | examine changes to 'plain2'? [Ynesfdaq?] y | |
|
335 | ||
|
319 | 336 | |
|
320 | 337 | Modify beginning, trim end, record both, add another file to test |
|
321 | 338 | changes numbering |
@@ -335,28 +352,33 b' changes numbering' | |||
|
335 | 352 | > EOF |
|
336 | 353 | diff --git a/plain b/plain |
|
337 | 354 | 2 hunks, 3 lines changed |
|
338 | examine changes to 'plain'? [Ynesfdaq?] | |
|
355 | examine changes to 'plain'? [Ynesfdaq?] y | |
|
356 | ||
|
339 | 357 | @@ -1,4 +1,4 @@ |
|
340 | 358 | -1 |
|
341 | 359 | +2 |
|
342 | 360 | 2 |
|
343 | 361 | 3 |
|
344 | 362 | 4 |
|
345 | record change 1/3 to 'plain'? [Ynesfdaq?] | |
|
363 | record change 1/3 to 'plain'? [Ynesfdaq?] y | |
|
364 | ||
|
346 | 365 | @@ -8,5 +8,3 @@ |
|
347 | 366 | 8 |
|
348 | 367 | 9 |
|
349 | 368 | 10 |
|
350 | 369 | -11 |
|
351 | 370 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
352 | record change 2/3 to 'plain'? [Ynesfdaq?] | |
|
371 | record change 2/3 to 'plain'? [Ynesfdaq?] y | |
|
372 | ||
|
353 | 373 | diff --git a/plain2 b/plain2 |
|
354 | 374 | 1 hunks, 1 lines changed |
|
355 | examine changes to 'plain2'? [Ynesfdaq?] | |
|
375 | examine changes to 'plain2'? [Ynesfdaq?] y | |
|
376 | ||
|
356 | 377 | @@ -1,1 +1,2 @@ |
|
357 | 378 | 1 |
|
358 | 379 | +2 |
|
359 | record change 3/3 to 'plain2'? [Ynesfdaq?] | |
|
380 | record change 3/3 to 'plain2'? [Ynesfdaq?] y | |
|
381 | ||
|
360 | 382 | |
|
361 | 383 | $ hg tip -p |
|
362 | 384 | changeset: 11:21df83db12b8 |
@@ -404,7 +426,8 b' Record end' | |||
|
404 | 426 | > EOF |
|
405 | 427 | diff --git a/plain b/plain |
|
406 | 428 | 2 hunks, 4 lines changed |
|
407 | examine changes to 'plain'? [Ynesfdaq?] | |
|
429 | examine changes to 'plain'? [Ynesfdaq?] y | |
|
430 | ||
|
408 | 431 | @@ -1,9 +1,6 @@ |
|
409 | 432 | -2 |
|
410 | 433 | -2 |
@@ -415,7 +438,8 b' Record end' | |||
|
415 | 438 | 7 |
|
416 | 439 | 8 |
|
417 | 440 | 9 |
|
418 | record change 1/2 to 'plain'? [Ynesfdaq?] | |
|
441 | record change 1/2 to 'plain'? [Ynesfdaq?] n | |
|
442 | ||
|
419 | 443 | @@ -4,7 +1,7 @@ |
|
420 | 444 | 4 |
|
421 | 445 | 5 |
@@ -425,7 +449,8 b' Record end' | |||
|
425 | 449 | 9 |
|
426 | 450 | -10 |
|
427 | 451 | +10.new |
|
428 | record change 2/2 to 'plain'? [Ynesfdaq?] | |
|
452 | record change 2/2 to 'plain'? [Ynesfdaq?] y | |
|
453 | ||
|
429 | 454 | |
|
430 | 455 | $ hg tip -p |
|
431 | 456 | changeset: 12:99337501826f |
@@ -453,7 +478,8 b' Record beginning' | |||
|
453 | 478 | > EOF |
|
454 | 479 | diff --git a/plain b/plain |
|
455 | 480 | 1 hunks, 3 lines changed |
|
456 | examine changes to 'plain'? [Ynesfdaq?] | |
|
481 | examine changes to 'plain'? [Ynesfdaq?] y | |
|
482 | ||
|
457 | 483 | @@ -1,6 +1,3 @@ |
|
458 | 484 | -2 |
|
459 | 485 | -2 |
@@ -461,7 +487,8 b' Record beginning' | |||
|
461 | 487 | 4 |
|
462 | 488 | 5 |
|
463 | 489 | 6 |
|
464 | record this change to 'plain'? [Ynesfdaq?] | |
|
490 | record this change to 'plain'? [Ynesfdaq?] y | |
|
491 | ||
|
465 | 492 | |
|
466 | 493 | $ hg tip -p |
|
467 | 494 | changeset: 13:bbd45465d540 |
@@ -498,7 +525,8 b' Record end' | |||
|
498 | 525 | > EOF |
|
499 | 526 | diff --git a/plain b/plain |
|
500 | 527 | 2 hunks, 4 lines changed |
|
501 | examine changes to 'plain'? [Ynesfdaq?] | |
|
528 | examine changes to 'plain'? [Ynesfdaq?] y | |
|
529 | ||
|
502 | 530 | @@ -1,6 +1,9 @@ |
|
503 | 531 | +1 |
|
504 | 532 | +2 |
@@ -509,7 +537,8 b' Record end' | |||
|
509 | 537 | 7 |
|
510 | 538 | 8 |
|
511 | 539 | 9 |
|
512 | record change 1/2 to 'plain'? [Ynesfdaq?] | |
|
540 | record change 1/2 to 'plain'? [Ynesfdaq?] n | |
|
541 | ||
|
513 | 542 | @@ -1,7 +4,6 @@ |
|
514 | 543 | 4 |
|
515 | 544 | 5 |
@@ -518,7 +547,8 b' Record end' | |||
|
518 | 547 | 8 |
|
519 | 548 | 9 |
|
520 | 549 | -10.new |
|
521 | record change 2/2 to 'plain'? [Ynesfdaq?] | |
|
550 | record change 2/2 to 'plain'? [Ynesfdaq?] y | |
|
551 | ||
|
522 | 552 | |
|
523 | 553 | Add to beginning, middle, end |
|
524 | 554 | |
@@ -537,14 +567,16 b' Record beginning, middle' | |||
|
537 | 567 | > EOF |
|
538 | 568 | diff --git a/plain b/plain |
|
539 | 569 | 3 hunks, 7 lines changed |
|
540 | examine changes to 'plain'? [Ynesfdaq?] | |
|
570 | examine changes to 'plain'? [Ynesfdaq?] y | |
|
571 | ||
|
541 | 572 | @@ -1,2 +1,5 @@ |
|
542 | 573 | +1 |
|
543 | 574 | +2 |
|
544 | 575 | +3 |
|
545 | 576 | 4 |
|
546 | 577 | 5 |
|
547 | record change 1/3 to 'plain'? [Ynesfdaq?] | |
|
578 | record change 1/3 to 'plain'? [Ynesfdaq?] y | |
|
579 | ||
|
548 | 580 | @@ -1,6 +4,8 @@ |
|
549 | 581 | 4 |
|
550 | 582 | 5 |
@@ -554,7 +586,8 b' Record beginning, middle' | |||
|
554 | 586 | 7 |
|
555 | 587 | 8 |
|
556 | 588 | 9 |
|
557 | record change 2/3 to 'plain'? [Ynesfdaq?] | |
|
589 | record change 2/3 to 'plain'? [Ynesfdaq?] y | |
|
590 | ||
|
558 | 591 | @@ -3,4 +8,6 @@ |
|
559 | 592 | 6 |
|
560 | 593 | 7 |
@@ -562,7 +595,8 b' Record beginning, middle' | |||
|
562 | 595 | 9 |
|
563 | 596 | +10 |
|
564 | 597 | +11 |
|
565 | record change 3/3 to 'plain'? [Ynesfdaq?] | |
|
598 | record change 3/3 to 'plain'? [Ynesfdaq?] n | |
|
599 | ||
|
566 | 600 | |
|
567 | 601 | $ hg tip -p |
|
568 | 602 | changeset: 15:f34a7937ec33 |
@@ -595,14 +629,16 b' Record end' | |||
|
595 | 629 | > EOF |
|
596 | 630 | diff --git a/plain b/plain |
|
597 | 631 | 1 hunks, 2 lines changed |
|
598 | examine changes to 'plain'? [Ynesfdaq?] | |
|
632 | examine changes to 'plain'? [Ynesfdaq?] y | |
|
633 | ||
|
599 | 634 | @@ -9,3 +9,5 @@ |
|
600 | 635 | 7 |
|
601 | 636 | 8 |
|
602 | 637 | 9 |
|
603 | 638 | +10 |
|
604 | 639 | +11 |
|
605 | record this change to 'plain'? [Ynesfdaq?] | |
|
640 | record this change to 'plain'? [Ynesfdaq?] y | |
|
641 | ||
|
606 | 642 | |
|
607 | 643 | $ hg tip -p |
|
608 | 644 | changeset: 16:f9900b71a04c |
@@ -635,11 +671,13 b' Record end' | |||
|
635 | 671 | > EOF |
|
636 | 672 | diff --git a/subdir/a b/subdir/a |
|
637 | 673 | 1 hunks, 1 lines changed |
|
638 | examine changes to 'subdir/a'? [Ynesfdaq?] | |
|
674 | examine changes to 'subdir/a'? [Ynesfdaq?] y | |
|
675 | ||
|
639 | 676 | @@ -1,1 +1,2 @@ |
|
640 | 677 | a |
|
641 | 678 | +a |
|
642 | record this change to 'subdir/a'? [Ynesfdaq?] | |
|
679 | record this change to 'subdir/a'? [Ynesfdaq?] y | |
|
680 | ||
|
643 | 681 | |
|
644 | 682 | $ hg tip -p |
|
645 | 683 | changeset: 18:61be427a9deb |
@@ -673,7 +711,8 b' Help, quit' | |||
|
673 | 711 | > EOF |
|
674 | 712 | diff --git a/subdir/f1 b/subdir/f1 |
|
675 | 713 | 1 hunks, 1 lines changed |
|
676 | examine changes to 'subdir/f1'? [Ynesfdaq?] | |
|
714 | examine changes to 'subdir/f1'? [Ynesfdaq?] ? | |
|
715 | ||
|
677 | 716 |
y - yes, record this |
|
678 | 717 | n - no, skip this change |
|
679 | 718 | e - edit this change manually |
@@ -683,7 +722,8 b' Help, quit' | |||
|
683 | 722 | a - record all changes to all remaining files |
|
684 | 723 | q - quit, recording no changes |
|
685 | 724 | ? - ? (display help) |
|
686 | examine changes to 'subdir/f1'? [Ynesfdaq?] | |
|
725 | examine changes to 'subdir/f1'? [Ynesfdaq?] q | |
|
726 | ||
|
687 | 727 | abort: user quit |
|
688 | 728 | [255] |
|
689 | 729 | |
@@ -694,7 +734,8 b' Skip' | |||
|
694 | 734 | > EOF |
|
695 | 735 | diff --git a/subdir/f1 b/subdir/f1 |
|
696 | 736 | 1 hunks, 1 lines changed |
|
697 | examine changes to 'subdir/f1'? [Ynesfdaq?] | |
|
737 | examine changes to 'subdir/f1'? [Ynesfdaq?] s | |
|
738 | ||
|
698 | 739 | diff --git a/subdir/f2 b/subdir/f2 |
|
699 | 740 | 1 hunks, 1 lines changed |
|
700 | 741 | examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected |
@@ -707,7 +748,8 b' No' | |||
|
707 | 748 | > EOF |
|
708 | 749 | diff --git a/subdir/f1 b/subdir/f1 |
|
709 | 750 | 1 hunks, 1 lines changed |
|
710 | examine changes to 'subdir/f1'? [Ynesfdaq?] | |
|
751 | examine changes to 'subdir/f1'? [Ynesfdaq?] n | |
|
752 | ||
|
711 | 753 | diff --git a/subdir/f2 b/subdir/f2 |
|
712 | 754 | 1 hunks, 1 lines changed |
|
713 | 755 | examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected |
@@ -721,10 +763,12 b' f, quit' | |||
|
721 | 763 | > EOF |
|
722 | 764 | diff --git a/subdir/f1 b/subdir/f1 |
|
723 | 765 | 1 hunks, 1 lines changed |
|
724 | examine changes to 'subdir/f1'? [Ynesfdaq?] | |
|
766 | examine changes to 'subdir/f1'? [Ynesfdaq?] f | |
|
767 | ||
|
725 | 768 | diff --git a/subdir/f2 b/subdir/f2 |
|
726 | 769 | 1 hunks, 1 lines changed |
|
727 | examine changes to 'subdir/f2'? [Ynesfdaq?] | |
|
770 | examine changes to 'subdir/f2'? [Ynesfdaq?] q | |
|
771 | ||
|
728 | 772 | abort: user quit |
|
729 | 773 | [255] |
|
730 | 774 | |
@@ -736,10 +780,12 b' s, all' | |||
|
736 | 780 | > EOF |
|
737 | 781 | diff --git a/subdir/f1 b/subdir/f1 |
|
738 | 782 | 1 hunks, 1 lines changed |
|
739 | examine changes to 'subdir/f1'? [Ynesfdaq?] | |
|
783 | examine changes to 'subdir/f1'? [Ynesfdaq?] s | |
|
784 | ||
|
740 | 785 | diff --git a/subdir/f2 b/subdir/f2 |
|
741 | 786 | 1 hunks, 1 lines changed |
|
742 | examine changes to 'subdir/f2'? [Ynesfdaq?] | |
|
787 | examine changes to 'subdir/f2'? [Ynesfdaq?] a | |
|
788 | ||
|
743 | 789 | |
|
744 | 790 | $ hg tip -p |
|
745 | 791 | changeset: 20:b3df3dda369a |
@@ -763,7 +809,8 b' f' | |||
|
763 | 809 | > EOF |
|
764 | 810 | diff --git a/subdir/f1 b/subdir/f1 |
|
765 | 811 | 1 hunks, 1 lines changed |
|
766 | examine changes to 'subdir/f1'? [Ynesfdaq?] | |
|
812 | examine changes to 'subdir/f1'? [Ynesfdaq?] f | |
|
813 | ||
|
767 | 814 | |
|
768 | 815 | $ hg tip -p |
|
769 | 816 | changeset: 21:38ec577f126b |
@@ -795,12 +842,14 b' Preserve chmod +x' | |||
|
795 | 842 | old mode 100644 |
|
796 | 843 | new mode 100755 |
|
797 | 844 | 1 hunks, 1 lines changed |
|
798 | examine changes to 'subdir/f1'? [Ynesfdaq?] | |
|
845 | examine changes to 'subdir/f1'? [Ynesfdaq?] y | |
|
846 | ||
|
799 | 847 | @@ -1,2 +1,3 @@ |
|
800 | 848 | a |
|
801 | 849 | a |
|
802 | 850 | +a |
|
803 | record this change to 'subdir/f1'? [Ynesfdaq?] | |
|
851 | record this change to 'subdir/f1'? [Ynesfdaq?] y | |
|
852 | ||
|
804 | 853 | |
|
805 | 854 | $ hg tip --config diff.git=True -p |
|
806 | 855 | changeset: 22:3261adceb075 |
@@ -830,13 +879,15 b' Preserve execute permission on original' | |||
|
830 | 879 | > EOF |
|
831 | 880 | diff --git a/subdir/f1 b/subdir/f1 |
|
832 | 881 | 1 hunks, 1 lines changed |
|
833 | examine changes to 'subdir/f1'? [Ynesfdaq?] | |
|
882 | examine changes to 'subdir/f1'? [Ynesfdaq?] y | |
|
883 | ||
|
834 | 884 | @@ -1,3 +1,4 @@ |
|
835 | 885 | a |
|
836 | 886 | a |
|
837 | 887 | a |
|
838 | 888 | +b |
|
839 | record this change to 'subdir/f1'? [Ynesfdaq?] | |
|
889 | record this change to 'subdir/f1'? [Ynesfdaq?] y | |
|
890 | ||
|
840 | 891 | |
|
841 | 892 | $ hg tip --config diff.git=True -p |
|
842 | 893 | changeset: 23:b429867550db |
@@ -868,13 +919,15 b' Preserve chmod -x' | |||
|
868 | 919 | old mode 100755 |
|
869 | 920 | new mode 100644 |
|
870 | 921 | 1 hunks, 1 lines changed |
|
871 | examine changes to 'subdir/f1'? [Ynesfdaq?] | |
|
922 | examine changes to 'subdir/f1'? [Ynesfdaq?] y | |
|
923 | ||
|
872 | 924 | @@ -2,3 +2,4 @@ |
|
873 | 925 | a |
|
874 | 926 | a |
|
875 | 927 | b |
|
876 | 928 | +c |
|
877 | record this change to 'subdir/f1'? [Ynesfdaq?] | |
|
929 | record this change to 'subdir/f1'? [Ynesfdaq?] y | |
|
930 | ||
|
878 | 931 | |
|
879 | 932 | $ hg tip --config diff.git=True -p |
|
880 | 933 | changeset: 24:0b082130c20a |
@@ -1062,14 +1115,16 b' Editing patch (and ignoring trailing tex' | |||
|
1062 | 1115 | > EOF |
|
1063 | 1116 | diff --git a/editedfile b/editedfile |
|
1064 | 1117 | 1 hunks, 2 lines changed |
|
1065 | examine changes to 'editedfile'? [Ynesfdaq?] | |
|
1118 | examine changes to 'editedfile'? [Ynesfdaq?] y | |
|
1119 | ||
|
1066 | 1120 | @@ -1,3 +1,3 @@ |
|
1067 | 1121 | -This is the first line |
|
1068 | 1122 | -This is the second line |
|
1069 | 1123 | +This line has changed |
|
1070 | 1124 | +This change will be committed |
|
1071 | 1125 | This is the third line |
|
1072 | record this change to 'editedfile'? [Ynesfdaq?] | |
|
1126 | record this change to 'editedfile'? [Ynesfdaq?] e | |
|
1127 | ||
|
1073 | 1128 | $ cat editedfile |
|
1074 | 1129 | This line has changed |
|
1075 | 1130 | This change will be committed |
@@ -1089,9 +1144,11 b' Trying to edit patch for whole file' | |||
|
1089 | 1144 | > EOF |
|
1090 | 1145 | diff --git a/editedfile b/editedfile |
|
1091 | 1146 | 1 hunks, 1 lines changed |
|
1092 | examine changes to 'editedfile'? [Ynesfdaq?] | |
|
1147 | examine changes to 'editedfile'? [Ynesfdaq?] e | |
|
1148 | ||
|
1093 | 1149 | cannot edit patch for whole file |
|
1094 | examine changes to 'editedfile'? [Ynesfdaq?] | |
|
1150 | examine changes to 'editedfile'? [Ynesfdaq?] q | |
|
1151 | ||
|
1095 | 1152 | abort: user quit |
|
1096 | 1153 | [255] |
|
1097 | 1154 | $ hg revert editedfile |
@@ -1111,7 +1168,8 b' Removing changes from patch' | |||
|
1111 | 1168 | > EOF |
|
1112 | 1169 | diff --git a/editedfile b/editedfile |
|
1113 | 1170 | 1 hunks, 3 lines changed |
|
1114 | examine changes to 'editedfile'? [Ynesfdaq?] | |
|
1171 | examine changes to 'editedfile'? [Ynesfdaq?] y | |
|
1172 | ||
|
1115 | 1173 | @@ -1,3 +1,3 @@ |
|
1116 | 1174 | -This is the first line |
|
1117 | 1175 | -This change will be committed |
@@ -1119,7 +1177,8 b' Removing changes from patch' | |||
|
1119 | 1177 | +This change will not be committed |
|
1120 | 1178 | +This is the second line |
|
1121 | 1179 | +This line has been added |
|
1122 | record this change to 'editedfile'? [Ynesfdaq?] | |
|
1180 | record this change to 'editedfile'? [Ynesfdaq?] e | |
|
1181 | ||
|
1123 | 1182 | no changes to record |
|
1124 | 1183 | $ cat editedfile |
|
1125 | 1184 | This change will not be committed |
@@ -1146,7 +1205,8 b' Invalid patch' | |||
|
1146 | 1205 | > EOF |
|
1147 | 1206 | diff --git a/editedfile b/editedfile |
|
1148 | 1207 | 1 hunks, 3 lines changed |
|
1149 | examine changes to 'editedfile'? [Ynesfdaq?] | |
|
1208 | examine changes to 'editedfile'? [Ynesfdaq?] y | |
|
1209 | ||
|
1150 | 1210 | @@ -1,3 +1,3 @@ |
|
1151 | 1211 | -This is the first line |
|
1152 | 1212 | -This change will be committed |
@@ -1154,7 +1214,8 b' Invalid patch' | |||
|
1154 | 1214 | +This change will not be committed |
|
1155 | 1215 | +This is the second line |
|
1156 | 1216 | +This line has been added |
|
1157 | record this change to 'editedfile'? [Ynesfdaq?] | |
|
1217 | record this change to 'editedfile'? [Ynesfdaq?] e | |
|
1218 | ||
|
1158 | 1219 | patching file editedfile |
|
1159 | 1220 | Hunk #1 FAILED at 0 |
|
1160 | 1221 | 1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej |
@@ -1191,7 +1252,8 b' Malformed patch - error handling' | |||
|
1191 | 1252 | > EOF |
|
1192 | 1253 | diff --git a/editedfile b/editedfile |
|
1193 | 1254 | 1 hunks, 3 lines changed |
|
1194 | examine changes to 'editedfile'? [Ynesfdaq?] | |
|
1255 | examine changes to 'editedfile'? [Ynesfdaq?] y | |
|
1256 | ||
|
1195 | 1257 | @@ -1,3 +1,3 @@ |
|
1196 | 1258 | -This is the first line |
|
1197 | 1259 | -This change will be committed |
@@ -1199,7 +1261,8 b' Malformed patch - error handling' | |||
|
1199 | 1261 | +This change will not be committed |
|
1200 | 1262 | +This is the second line |
|
1201 | 1263 | +This line has been added |
|
1202 | record this change to 'editedfile'? [Ynesfdaq?] | |
|
1264 | record this change to 'editedfile'? [Ynesfdaq?] e | |
|
1265 | ||
|
1203 | 1266 | abort: error parsing patch: unhandled transition: range -> range |
|
1204 | 1267 | [255] |
|
1205 | 1268 | |
@@ -1216,7 +1279,8 b' random text in random positions is still' | |||
|
1216 | 1279 | > EOF |
|
1217 | 1280 | diff --git a/editedfile b/editedfile |
|
1218 | 1281 | 1 hunks, 3 lines changed |
|
1219 | examine changes to 'editedfile'? [Ynesfdaq?] | |
|
1282 | examine changes to 'editedfile'? [Ynesfdaq?] y | |
|
1283 | ||
|
1220 | 1284 | @@ -1,3 +1,3 @@ |
|
1221 | 1285 | -This is the first line |
|
1222 | 1286 | -This change will be committed |
@@ -1224,7 +1288,8 b' random text in random positions is still' | |||
|
1224 | 1288 | +This change will not be committed |
|
1225 | 1289 | +This is the second line |
|
1226 | 1290 | +This line has been added |
|
1227 | record this change to 'editedfile'? [Ynesfdaq?] | |
|
1291 | record this change to 'editedfile'? [Ynesfdaq?] e | |
|
1292 | ||
|
1228 | 1293 | abort: error parsing patch: unhandled transition: file -> other |
|
1229 | 1294 | [255] |
|
1230 | 1295 | |
@@ -1254,13 +1319,15 b' Ignore win32text deprecation warning for' | |||
|
1254 | 1319 | > EOF |
|
1255 | 1320 | diff --git a/subdir/f1 b/subdir/f1 |
|
1256 | 1321 | 1 hunks, 1 lines changed |
|
1257 | examine changes to 'subdir/f1'? [Ynesfdaq?] | |
|
1322 | examine changes to 'subdir/f1'? [Ynesfdaq?] y | |
|
1323 | ||
|
1258 | 1324 | @@ -3,3 +3,4 @@ |
|
1259 | 1325 | a |
|
1260 | 1326 | b |
|
1261 | 1327 | c |
|
1262 | 1328 | +d |
|
1263 | record this change to 'subdir/f1'? [Ynesfdaq?] | |
|
1329 | record this change to 'subdir/f1'? [Ynesfdaq?] y | |
|
1330 | ||
|
1264 | 1331 | |
|
1265 | 1332 | $ hg tip -p |
|
1266 | 1333 | changeset: 28:* (glob) |
@@ -1287,13 +1354,15 b' Test --user when ui.username not set' | |||
|
1287 | 1354 | > EOF |
|
1288 | 1355 | diff --git a/subdir/f1 b/subdir/f1 |
|
1289 | 1356 | 1 hunks, 1 lines changed |
|
1290 | examine changes to 'subdir/f1'? [Ynesfdaq?] | |
|
1357 | examine changes to 'subdir/f1'? [Ynesfdaq?] y | |
|
1358 | ||
|
1291 | 1359 | @@ -4,3 +4,4 @@ |
|
1292 | 1360 | b |
|
1293 | 1361 | c |
|
1294 | 1362 | d |
|
1295 | 1363 | +e |
|
1296 | record this change to 'subdir/f1'? [Ynesfdaq?] | |
|
1364 | record this change to 'subdir/f1'? [Ynesfdaq?] y | |
|
1365 | ||
|
1297 | 1366 | $ hg log --template '{author}\n' -l 1 |
|
1298 | 1367 | xyz |
|
1299 | 1368 | $ HGUSER="test" |
@@ -508,15 +508,20 b' test interactive transplant' | |||
|
508 | 508 | > c |
|
509 | 509 | > EOF |
|
510 | 510 | 0:17ab29e464c6 |
|
511 | apply changeset? [ynmpcq?]: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
|
511 | apply changeset? [ynmpcq?]: p | |
|
512 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
|
512 | 513 | +++ b/r1 Thu Jan 01 00:00:00 1970 +0000 |
|
513 | 514 | @@ -0,0 +1,1 @@ |
|
514 | 515 | +r1 |
|
515 |
apply changeset? [ynmpcq?]: |
|
|
516 | apply changeset? [ynmpcq?]: 2:37a1297eb21b | |
|
517 |
apply changeset? [ynmpcq?]: |
|
|
518 | apply changeset? [ynmpcq?]: 4:a53251cdf717 | |
|
519 |
apply changeset? [ynmpcq?]: |
|
|
516 | apply changeset? [ynmpcq?]: y | |
|
517 | 1:d11e3596cc1a | |
|
518 | apply changeset? [ynmpcq?]: n | |
|
519 | 2:37a1297eb21b | |
|
520 | apply changeset? [ynmpcq?]: n | |
|
521 | 3:722f4667af76 | |
|
522 | apply changeset? [ynmpcq?]: m | |
|
523 | 4:a53251cdf717 | |
|
524 | apply changeset? [ynmpcq?]: c | |
|
520 | 525 | $ hg log -G --template "{node|short}" |
|
521 | 526 | @ 88be5dde5260 |
|
522 | 527 | |\ |
@@ -533,16 +538,19 b' test interactive transplant' | |||
|
533 | 538 | > q |
|
534 | 539 | > EOF |
|
535 | 540 | 1:d11e3596cc1a |
|
536 |
apply changeset? [ynmpcq?]: |
|
|
537 | apply changeset? [ynmpcq?]: y: yes, transplant this changeset | |
|
541 | apply changeset? [ynmpcq?]: x | |
|
542 | unrecognized response | |
|
543 | apply changeset? [ynmpcq?]: ? | |
|
544 | y: yes, transplant this changeset | |
|
538 | 545 | n: no, skip this changeset |
|
539 | 546 | m: merge at this changeset |
|
540 | 547 | p: show patch |
|
541 | 548 | c: commit selected changesets |
|
542 | 549 | q: quit and cancel transplant |
|
543 | 550 | ?: ? (show this help) |
|
544 |
apply changeset? [ynmpcq?]: |
|
|
545 | apply changeset? [ynmpcq?]: (no-eol) | |
|
551 | apply changeset? [ynmpcq?]: y | |
|
552 | 4:a53251cdf717 | |
|
553 | apply changeset? [ynmpcq?]: q | |
|
546 | 554 | $ hg heads --template "{node|short}\n" |
|
547 | 555 | 88be5dde5260 |
|
548 | 556 |
General Comments 0
You need to be logged in to leave comments.
Login now