Mercurial > evolve

comparison tests/test-uncommit-interactive.t @ 5159:e5fe3ca5e6ad mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 28 Feb 2020 23:18:48 +0700
parents ff452675566c 900668a93629
children 7f856606d5a9 e6e92835d42d
comparison
equal deleted inserted replaced
5158:8d20c0af010a 5159:e5fe3ca5e6ad
39 $ hg uncommit -i<<EOF 39 $ hg uncommit -i<<EOF
40 > q 40 > q
41 > EOF 41 > EOF
42 diff --git a/a b/a 42 diff --git a/a b/a
43 new file mode 100644 43 new file mode 100644
44 examine changes to 'a'? 44 examine changes to 'a'? [Ynesfdaq?] q
45 (enter ? for help) [Ynesfdaq?] q
46 45
47 abort: user quit 46 abort: user quit
48 [255] 47 [255]
49 $ hg status 48 $ hg status
50 49
93 > n 92 > n
94 > n 93 > n
95 > EOF 94 > EOF
96 diff --git a/a b/a 95 diff --git a/a b/a
97 3 hunks, 6 lines changed 96 3 hunks, 6 lines changed
98 examine changes to 'a'? 97 examine changes to 'a'? [Ynesfdaq?] y
99 (enter ? for help) [Ynesfdaq?] y
100 98
101 @@ -1,3 +1,6 @@ 99 @@ -1,3 +1,6 @@
102 +-2 100 +-2
103 +-1 101 +-1
104 +0 102 +0
105 1 103 1
106 2 104 2
107 3 105 3
108 discard change 1/3 to 'a'? 106 discard change 1/3 to 'a'? [Ynesfdaq?] n
109 (enter ? for help) [Ynesfdaq?] n
110 107
111 @@ -1,5 +4,7 @@ 108 @@ -1,5 +4,7 @@
112 1 109 1
113 2 110 2
114 3 111 3
115 +foo 112 +foo
116 +bar 113 +bar
117 4 114 4
118 5 115 5
119 discard change 2/3 to 'a'? 116 discard change 2/3 to 'a'? [Ynesfdaq?] n
120 (enter ? for help) [Ynesfdaq?] n
121 117
122 @@ -4,2 +9,3 @@ 118 @@ -4,2 +9,3 @@
123 4 119 4
124 5 120 5
125 +babar 121 +babar
126 discard change 3/3 to 'a'? 122 discard change 3/3 to 'a'? [Ynesfdaq?] n
127 (enter ? for help) [Ynesfdaq?] n
128 123
129 abort: nothing selected to uncommit 124 abort: nothing selected to uncommit
130 [255] 125 [255]
131 $ hg status 126 $ hg status
132 127
139 > n 134 > n
140 > n 135 > n
141 > EOF 136 > EOF
142 diff --git a/a b/a 137 diff --git a/a b/a
143 3 hunks, 6 lines changed 138 3 hunks, 6 lines changed
144 examine changes to 'a'? 139 examine changes to 'a'? [Ynesfdaq?] y
145 (enter ? for help) [Ynesfdaq?] y
146 140
147 @@ -1,3 +1,6 @@ 141 @@ -1,3 +1,6 @@
148 +-2 142 +-2
149 +-1 143 +-1
150 +0 144 +0
151 1 145 1
152 2 146 2
153 3 147 3
154 discard change 1/3 to 'a'? 148 discard change 1/3 to 'a'? [Ynesfdaq?] y
155 (enter ? for help) [Ynesfdaq?] y
156 149
157 @@ -1,5 +4,7 @@ 150 @@ -1,5 +4,7 @@
158 1 151 1
159 2 152 2
160 3 153 3
161 +foo 154 +foo
162 +bar 155 +bar
163 4 156 4
164 5 157 5
165 discard change 2/3 to 'a'? 158 discard change 2/3 to 'a'? [Ynesfdaq?] n
166 (enter ? for help) [Ynesfdaq?] n
167 159
168 @@ -4,2 +9,3 @@ 160 @@ -4,2 +9,3 @@
169 4 161 4
170 5 162 5
171 +babar 163 +babar
172 discard change 3/3 to 'a'? 164 discard change 3/3 to 'a'? [Ynesfdaq?] n
173 (enter ? for help) [Ynesfdaq?] n
174 165
175 166
176 $ hg obslog 167 $ hg obslog
177 @ 678a59e5ff90 (3) another one 168 @ 678a59e5ff90 (3) another one
178 | 169 |
242 > n 233 > n
243 > y 234 > y
244 > EOF 235 > EOF
245 diff --git a/a b/a 236 diff --git a/a b/a
246 2 hunks, 3 lines changed 237 2 hunks, 3 lines changed
247 examine changes to 'a'? 238 examine changes to 'a'? [Ynesfdaq?] y
248 (enter ? for help) [Ynesfdaq?] y
249 239
250 @@ -1,5 +1,7 @@ 240 @@ -1,5 +1,7 @@
251 1 241 1
252 2 242 2
253 3 243 3
254 +foo 244 +foo
255 +bar 245 +bar
256 4 246 4
257 5 247 5
258 discard change 1/2 to 'a'? 248 discard change 1/2 to 'a'? [Ynesfdaq?] n
259 (enter ? for help) [Ynesfdaq?] n
260 249
261 @@ -4,2 +6,3 @@ 250 @@ -4,2 +6,3 @@
262 4 251 4
263 5 252 5
264 +babar 253 +babar
265 discard change 2/2 to 'a'? 254 discard change 2/2 to 'a'? [Ynesfdaq?] y
266 (enter ? for help) [Ynesfdaq?] y
267 255
268 patching file a 256 patching file a
269 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). 257 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
270 258
271 $ hg diff 259 $ hg diff
340 > y 328 > y
341 > y 329 > y
342 > EOF 330 > EOF
343 diff --git a/foo b/foo 331 diff --git a/foo b/foo
344 new file mode 100644 332 new file mode 100644
345 examine changes to 'foo'? 333 examine changes to 'foo'? [Ynesfdaq?] y
346 (enter ? for help) [Ynesfdaq?] y
347 334
348 @@ -0,0 +1,1 @@ 335 @@ -0,0 +1,1 @@
349 +hey 336 +hey
350 discard this change to 'foo'? 337 discard this change to 'foo'? [Ynesfdaq?] y
351 (enter ? for help) [Ynesfdaq?] y
352 338
353 new changeset is empty 339 new changeset is empty
354 (use 'hg prune .' to remove it) 340 (use 'hg prune .' to remove it)
355 341
356 $ hg status 342 $ hg status
409 $ hg uncommit -i<<EOF 395 $ hg uncommit -i<<EOF
410 > n 396 > n
411 > EOF 397 > EOF
412 diff --git a/a b/a 398 diff --git a/a b/a
413 deleted file mode 100644 399 deleted file mode 100644
414 examine changes to 'a'? 400 examine changes to 'a'? [Ynesfdaq?] n
415 (enter ? for help) [Ynesfdaq?] n
416 401
417 abort: nothing selected to uncommit 402 abort: nothing selected to uncommit
418 [255] 403 [255]
419 404
420 Examining the file 405 Examining the file
427 $ hg uncommit -i<<EOF 412 $ hg uncommit -i<<EOF
428 > y 413 > y
429 > EOF 414 > EOF
430 diff --git a/a b/a 415 diff --git a/a b/a
431 deleted file mode 100644 416 deleted file mode 100644
432 examine changes to 'a'? 417 examine changes to 'a'? [Ynesfdaq?] y
433 (enter ? for help) [Ynesfdaq?] y
434 418
435 new changeset is empty 419 new changeset is empty
436 (use 'hg prune .' to remove it) 420 (use 'hg prune .' to remove it)
437 421
438 $ hg diff 422 $ hg diff
492 > y 476 > y
493 > n 477 > n
494 > EOF 478 > EOF
495 diff --git a/foo b/foo 479 diff --git a/foo b/foo
496 1 hunks, 1 lines changed 480 1 hunks, 1 lines changed
497 examine changes to 'foo'? 481 examine changes to 'foo'? [Ynesfdaq?] y
498 (enter ? for help) [Ynesfdaq?] y
499 482
500 @@ -1,1 +1,2 @@ 483 @@ -1,1 +1,2 @@
501 hey 484 hey
502 +foo 485 +foo
503 discard change 1/2 to 'foo'? 486 discard change 1/2 to 'foo'? [Ynesfdaq?] y
504 (enter ? for help) [Ynesfdaq?] y
505 487
506 diff --git a/x b/x 488 diff --git a/x b/x
507 new file mode 100644 489 new file mode 100644
508 examine changes to 'x'? 490 examine changes to 'x'? [Ynesfdaq?] y
509 (enter ? for help) [Ynesfdaq?] y
510 491
511 @@ -0,0 +1,1 @@ 492 @@ -0,0 +1,1 @@
512 +abcd 493 +abcd
513 discard change 2/2 to 'x'? 494 discard change 2/2 to 'x'? [Ynesfdaq?] n
514 (enter ? for help) [Ynesfdaq?] n
515 495
516 496
517 $ hg exp 497 $ hg exp
518 # HG changeset patch 498 # HG changeset patch
519 # User test 499 # User test
596 > n 576 > n
597 > y 577 > y
598 > EOF 578 > EOF
599 diff --git a/a b/a 579 diff --git a/a b/a
600 3 hunks, 6 lines changed 580 3 hunks, 6 lines changed
601 examine changes to 'a'? 581 examine changes to 'a'? [Ynesfdaq?] y
602 (enter ? for help) [Ynesfdaq?] y
603 582
604 @@ -1,3 +1,6 @@ 583 @@ -1,3 +1,6 @@
605 +-2 584 +-2
606 +-1 585 +-1
607 +0 586 +0
608 1 587 1
609 2 588 2
610 3 589 3
611 discard change 1/3 to 'a'? 590 discard change 1/3 to 'a'? [Ynesfdaq?] n
612 (enter ? for help) [Ynesfdaq?] n
613 591
614 @@ -1,5 +4,7 @@ 592 @@ -1,5 +4,7 @@
615 1 593 1
616 2 594 2
617 3 595 3
618 +foo 596 +foo
619 +bar 597 +bar
620 4 598 4
621 5 599 5
622 discard change 2/3 to 'a'? 600 discard change 2/3 to 'a'? [Ynesfdaq?] n
623 (enter ? for help) [Ynesfdaq?] n
624 601
625 @@ -4,2 +9,3 @@ 602 @@ -4,2 +9,3 @@
626 4 603 4
627 5 604 5
628 +babar 605 +babar
629 discard change 3/3 to 'a'? 606 discard change 3/3 to 'a'? [Ynesfdaq?] y
630 (enter ? for help) [Ynesfdaq?] y
631 607
632 patching file a 608 patching file a
633 Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines). 609 Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
634 2 new orphan changesets 610 2 new orphan changesets
635 611
684 > y 660 > y
685 > n 661 > n
686 > EOF 662 > EOF
687 diff --git a/a b/a 663 diff --git a/a b/a
688 2 hunks, 5 lines changed 664 2 hunks, 5 lines changed
689 examine changes to 'a'? 665 examine changes to 'a'? [Ynesfdaq?] y
690 (enter ? for help) [Ynesfdaq?] y
691 666
692 @@ -1,3 +1,6 @@ 667 @@ -1,3 +1,6 @@
693 +-2 668 +-2
694 +-1 669 +-1
695 +0 670 +0
696 1 671 1
697 2 672 2
698 3 673 3
699 discard change 1/2 to 'a'? 674 discard change 1/2 to 'a'? [Ynesfdaq?] y
700 (enter ? for help) [Ynesfdaq?] y
701 675
702 @@ -1,5 +4,7 @@ 676 @@ -1,5 +4,7 @@
703 1 677 1
704 2 678 2
705 3 679 3
706 +foo 680 +foo
707 +bar 681 +bar
708 4 682 4
709 5 683 5
710 discard change 2/2 to 'a'? 684 discard change 2/2 to 'a'? [Ynesfdaq?] n
711 (enter ? for help) [Ynesfdaq?] n
712 685
713 686
714 $ hg exp 687 $ hg exp
715 # HG changeset patch 688 # HG changeset patch
716 # User test 689 # User test
813 @@ -9,3 +9,4 @@ 786 @@ -9,3 +9,4 @@
814 4 787 4
815 5 788 5
816 babar 789 babar
817 +celeste 790 +celeste
818 discard this change to 'a'? 791 discard this change to 'a'? [Ynesfdaq?] y
819 (enter ? for help) [Ynesfdaq?] y
820 792
821 $ hg status 793 $ hg status
822 M a 794 M a
823 ? foo.orig 795 ? foo.orig
824 $ hg diff 796 $ hg diff
878 @@ -1,3 +1,4 @@ 850 @@ -1,3 +1,4 @@
879 +-3 851 +-3
880 -2 852 -2
881 -1 853 -1
882 0 854 0
883 discard change 1/2 to 'a'? 855 discard change 1/2 to 'a'? [Ynesfdaq?] y
884 (enter ? for help) [Ynesfdaq?] y
885 856
886 @@ -9,3 +10,4 @@ 857 @@ -9,3 +10,4 @@
887 4 858 4
888 5 859 5
889 babar 860 babar
890 +celeste 861 +celeste
891 discard change 2/2 to 'a'? 862 discard change 2/2 to 'a'? [Ynesfdaq?] n
892 (enter ? for help) [Ynesfdaq?] n
893 863
894 $ hg status 864 $ hg status
895 M a 865 M a
896 ? foo.orig 866 ? foo.orig
897 867