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