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