Mercurial > evolve

comparison tests/test-uncommit-interactive.t @ 5898:91207a1c4dfa 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 Sat, 24 Apr 2021 21:34:57 +0800
parents c2c85576ddfb
children 785b5be835ee 49c2890007d2
comparison
equal deleted inserted replaced
5897:888bed8033f1 5898:91207a1c4dfa
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 debugobsolete 167 $ hg debugobsolete
177 e9635f4beaf11f64a07ccc74684092b144c53d89 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'} 168 e9635f4beaf11f64a07ccc74684092b144c53d89 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'}
178 f70fb463d5bf9f0ffd38f105521d96e9f2591bc1 678a59e5ff90754d5e94719bd82ad169be773c21 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'note on amend --extract', 'operation': 'uncommit', 'user': 'test'} 169 f70fb463d5bf9f0ffd38f105521d96e9f2591bc1 678a59e5ff90754d5e94719bd82ad169be773c21 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'note on amend --extract', 'operation': 'uncommit', 'user': 'test'}
245 > n 236 > n
246 > y 237 > y
247 > EOF 238 > EOF
248 diff --git a/a b/a 239 diff --git a/a b/a
249 2 hunks, 3 lines changed 240 2 hunks, 3 lines changed
250 examine changes to 'a'? 241 examine changes to 'a'? [Ynesfdaq?] y
251 (enter ? for help) [Ynesfdaq?] y
252 242
253 @@ -1,5 +1,7 @@ 243 @@ -1,5 +1,7 @@
254 1 244 1
255 2 245 2
256 3 246 3
257 +foo 247 +foo
258 +bar 248 +bar
259 4 249 4
260 5 250 5
261 discard change 1/2 to 'a'? 251 discard change 1/2 to 'a'? [Ynesfdaq?] n
262 (enter ? for help) [Ynesfdaq?] n
263 252
264 @@ -4,2 +6,3 @@ 253 @@ -4,2 +6,3 @@
265 4 254 4
266 5 255 5
267 +babar 256 +babar
268 discard change 2/2 to 'a'? 257 discard change 2/2 to 'a'? [Ynesfdaq?] y
269 (enter ? for help) [Ynesfdaq?] y
270 258
271 patching file a 259 patching file a
272 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). 260 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
273 261
274 $ hg diff 262 $ hg diff
348 > y 336 > y
349 > y 337 > y
350 > EOF 338 > EOF
351 diff --git a/foo b/foo 339 diff --git a/foo b/foo
352 new file mode 100644 340 new file mode 100644
353 examine changes to 'foo'? 341 examine changes to 'foo'? [Ynesfdaq?] y
354 (enter ? for help) [Ynesfdaq?] y
355 342
356 @@ -0,0 +1,1 @@ 343 @@ -0,0 +1,1 @@
357 +hey 344 +hey
358 discard this change to 'foo'? 345 discard this change to 'foo'? [Ynesfdaq?] y
359 (enter ? for help) [Ynesfdaq?] y
360 346
361 new changeset is empty 347 new changeset is empty
362 (use 'hg prune .' to remove it) 348 (use 'hg prune .' to remove it)
363 349
364 $ hg status 350 $ hg status
417 $ hg uncommit -i<<EOF 403 $ hg uncommit -i<<EOF
418 > n 404 > n
419 > EOF 405 > EOF
420 diff --git a/a b/a 406 diff --git a/a b/a
421 deleted file mode 100644 407 deleted file mode 100644
422 examine changes to 'a'? 408 examine changes to 'a'? [Ynesfdaq?] n
423 (enter ? for help) [Ynesfdaq?] n
424 409
425 abort: nothing selected to uncommit 410 abort: nothing selected to uncommit
426 [255] 411 [255]
427 412
428 Examining the file 413 Examining the file
435 $ hg uncommit -i<<EOF 420 $ hg uncommit -i<<EOF
436 > y 421 > y
437 > EOF 422 > EOF
438 diff --git a/a b/a 423 diff --git a/a b/a
439 deleted file mode 100644 424 deleted file mode 100644
440 examine changes to 'a'? 425 examine changes to 'a'? [Ynesfdaq?] y
441 (enter ? for help) [Ynesfdaq?] y
442 426
443 new changeset is empty 427 new changeset is empty
444 (use 'hg prune .' to remove it) 428 (use 'hg prune .' to remove it)
445 429
446 $ hg diff 430 $ hg diff
500 > y 484 > y
501 > n 485 > n
502 > EOF 486 > EOF
503 diff --git a/foo b/foo 487 diff --git a/foo b/foo
504 1 hunks, 1 lines changed 488 1 hunks, 1 lines changed
505 examine changes to 'foo'? 489 examine changes to 'foo'? [Ynesfdaq?] y
506 (enter ? for help) [Ynesfdaq?] y
507 490
508 @@ -1,1 +1,2 @@ 491 @@ -1,1 +1,2 @@
509 hey 492 hey
510 +foo 493 +foo
511 discard change 1/2 to 'foo'? 494 discard change 1/2 to 'foo'? [Ynesfdaq?] y
512 (enter ? for help) [Ynesfdaq?] y
513 495
514 diff --git a/x b/x 496 diff --git a/x b/x
515 new file mode 100644 497 new file mode 100644
516 examine changes to 'x'? 498 examine changes to 'x'? [Ynesfdaq?] y
517 (enter ? for help) [Ynesfdaq?] y
518 499
519 @@ -0,0 +1,1 @@ 500 @@ -0,0 +1,1 @@
520 +abcd 501 +abcd
521 discard change 2/2 to 'x'? 502 discard change 2/2 to 'x'? [Ynesfdaq?] n
522 (enter ? for help) [Ynesfdaq?] n
523 503
524 504
525 $ hg exp 505 $ hg exp
526 # HG changeset patch 506 # HG changeset patch
527 # User test 507 # User test
604 > n 584 > n
605 > y 585 > y
606 > EOF 586 > EOF
607 diff --git a/a b/a 587 diff --git a/a b/a
608 3 hunks, 6 lines changed 588 3 hunks, 6 lines changed
609 examine changes to 'a'? 589 examine changes to 'a'? [Ynesfdaq?] y
610 (enter ? for help) [Ynesfdaq?] y
611 590
612 @@ -1,3 +1,6 @@ 591 @@ -1,3 +1,6 @@
613 +-2 592 +-2
614 +-1 593 +-1
615 +0 594 +0
616 1 595 1
617 2 596 2
618 3 597 3
619 discard change 1/3 to 'a'? 598 discard change 1/3 to 'a'? [Ynesfdaq?] n
620 (enter ? for help) [Ynesfdaq?] n
621 599
622 @@ -1,5 +4,7 @@ 600 @@ -1,5 +4,7 @@
623 1 601 1
624 2 602 2
625 3 603 3
626 +foo 604 +foo
627 +bar 605 +bar
628 4 606 4
629 5 607 5
630 discard change 2/3 to 'a'? 608 discard change 2/3 to 'a'? [Ynesfdaq?] n
631 (enter ? for help) [Ynesfdaq?] n
632 609
633 @@ -4,2 +9,3 @@ 610 @@ -4,2 +9,3 @@
634 4 611 4
635 5 612 5
636 +babar 613 +babar
637 discard change 3/3 to 'a'? 614 discard change 3/3 to 'a'? [Ynesfdaq?] y
638 (enter ? for help) [Ynesfdaq?] y
639 615
640 patching file a 616 patching file a
641 Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines). 617 Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
642 2 new orphan changesets 618 2 new orphan changesets
643 619
692 > y 668 > y
693 > n 669 > n
694 > EOF 670 > EOF
695 diff --git a/a b/a 671 diff --git a/a b/a
696 2 hunks, 5 lines changed 672 2 hunks, 5 lines changed
697 examine changes to 'a'? 673 examine changes to 'a'? [Ynesfdaq?] y
698 (enter ? for help) [Ynesfdaq?] y
699 674
700 @@ -1,3 +1,6 @@ 675 @@ -1,3 +1,6 @@
701 +-2 676 +-2
702 +-1 677 +-1
703 +0 678 +0
704 1 679 1
705 2 680 2
706 3 681 3
707 discard change 1/2 to 'a'? 682 discard change 1/2 to 'a'? [Ynesfdaq?] y
708 (enter ? for help) [Ynesfdaq?] y
709 683
710 @@ -1,5 +4,7 @@ 684 @@ -1,5 +4,7 @@
711 1 685 1
712 2 686 2
713 3 687 3
714 +foo 688 +foo
715 +bar 689 +bar
716 4 690 4
717 5 691 5
718 discard change 2/2 to 'a'? 692 discard change 2/2 to 'a'? [Ynesfdaq?] n
719 (enter ? for help) [Ynesfdaq?] n
720 693
721 694
722 $ hg exp 695 $ hg exp
723 # HG changeset patch 696 # HG changeset patch
724 # User test 697 # User test
821 @@ -9,3 +9,4 @@ 794 @@ -9,3 +9,4 @@
822 4 795 4
823 5 796 5
824 babar 797 babar
825 +celeste 798 +celeste
826 discard this change to 'a'? 799 discard this change to 'a'? [Ynesfdaq?] y
827 (enter ? for help) [Ynesfdaq?] y
828 800
829 $ hg status 801 $ hg status
830 M a 802 M a
831 ? foo.orig 803 ? foo.orig
832 $ hg diff 804 $ hg diff
886 @@ -1,3 +1,4 @@ 858 @@ -1,3 +1,4 @@
887 +-3 859 +-3
888 -2 860 -2
889 -1 861 -1
890 0 862 0
891 discard change 1/2 to 'a'? 863 discard change 1/2 to 'a'? [Ynesfdaq?] y
892 (enter ? for help) [Ynesfdaq?] y
893 864
894 @@ -9,3 +10,4 @@ 865 @@ -9,3 +10,4 @@
895 4 866 4
896 5 867 5
897 babar 868 babar
898 +celeste 869 +celeste
899 discard change 2/2 to 'a'? 870 discard change 2/2 to 'a'? [Ynesfdaq?] n
900 (enter ? for help) [Ynesfdaq?] n
901 871
902 $ hg status 872 $ hg status
903 M a 873 M a
904 ? foo.orig 874 ? foo.orig
905 875