Mercurial > hg-stable

comparison tests/test-split.t @ 45796:84ce9ffc95ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
split: use default one-line summary Differential Revision: https://phab.mercurial-scm.org/D9255
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 27 Oct 2020 10:06:17 -0700
parents f90a5c211251
children 527ce85c2e60
comparison
equal deleted inserted replaced
45795:294aab57a5f3 45796:84ce9ffc95ad
214 +33 214 +33
215 record change 2/2 to 'a'? 215 record change 2/2 to 'a'?
216 (enter ? for help) [Ynesfdaq?] y 216 (enter ? for help) [Ynesfdaq?] y
217 217
218 EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into: 218 EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:
219 EDITOR: HG: - e704349bd21b: split 1 219 EDITOR: HG: - 2:e704349bd21b tip "split 1"
220 EDITOR: HG: Write commit message for the next split changeset. 220 EDITOR: HG: Write commit message for the next split changeset.
221 EDITOR: a2 221 EDITOR: a2
222 EDITOR: 222 EDITOR:
223 EDITOR: 223 EDITOR:
224 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. 224 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
237 +11 237 +11
238 record this change to 'a'? 238 record this change to 'a'?
239 (enter ? for help) [Ynesfdaq?] y 239 (enter ? for help) [Ynesfdaq?] y
240 240
241 EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into: 241 EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:
242 EDITOR: HG: - e704349bd21b: split 1 242 EDITOR: HG: - 2:e704349bd21b tip "split 1"
243 EDITOR: HG: - a09ad58faae3: split 2 243 EDITOR: HG: - 3:a09ad58faae3 "split 2"
244 EDITOR: HG: Write commit message for the next split changeset. 244 EDITOR: HG: Write commit message for the next split changeset.
245 EDITOR: a2 245 EDITOR: a2
246 EDITOR: 246 EDITOR:
247 EDITOR: 247 EDITOR:
248 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. 248 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
659 1 hunks, 1 lines changed 659 1 hunks, 1 lines changed
660 examine changes to 'foo'? 660 examine changes to 'foo'?
661 (enter ? for help) [Ynesfdaq?] f 661 (enter ? for help) [Ynesfdaq?] f
662 662
663 EDITOR: HG: Splitting dd3c45017cbf. So far it has been split into: 663 EDITOR: HG: Splitting dd3c45017cbf. So far it has been split into:
664 EDITOR: HG: - f205aea1c624: split 1 664 EDITOR: HG: - 2:f205aea1c624 tip "split 1"
665 EDITOR: HG: Write commit message for the next split changeset. 665 EDITOR: HG: Write commit message for the next split changeset.
666 EDITOR: splitme 666 EDITOR: splitme
667 EDITOR: 667 EDITOR:
668 EDITOR: 668 EDITOR:
669 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. 669 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
716 2 hunks, 2 lines changed 716 2 hunks, 2 lines changed
717 examine changes to 'foo'? 717 examine changes to 'foo'?
718 (enter ? for help) [Ynesfdaq?] f 718 (enter ? for help) [Ynesfdaq?] f
719 719
720 EDITOR: HG: Splitting 904c80b40a4a. So far it has been split into: 720 EDITOR: HG: Splitting 904c80b40a4a. So far it has been split into:
721 EDITOR: HG: - ffecf40fa954: split 1 721 EDITOR: HG: - 2:ffecf40fa954 tip "split 1"
722 EDITOR: HG: Write commit message for the next split changeset. 722 EDITOR: HG: Write commit message for the next split changeset.
723 EDITOR: splitme 723 EDITOR: splitme
724 EDITOR: 724 EDITOR:
725 EDITOR: 725 EDITOR:
726 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. 726 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
841 1 hunks, 2 lines changed 841 1 hunks, 2 lines changed
842 examine changes to 'file2'? 842 examine changes to 'file2'?
843 (enter ? for help) [Ynesfdaq?] a 843 (enter ? for help) [Ynesfdaq?] a
844 844
845 EDITOR: HG: Splitting 8c42fa635116. So far it has been split into: 845 EDITOR: HG: Splitting 8c42fa635116. So far it has been split into:
846 EDITOR: HG: - 478be2a70c27: split1, keeping only the numbered lines 846 EDITOR: HG: - 2:478be2a70c27 tip "split1, keeping only the numbered lines"
847 EDITOR: HG: Write commit message for the next split changeset. 847 EDITOR: HG: Write commit message for the next split changeset.
848 EDITOR: move and modify 848 EDITOR: move and modify
849 EDITOR: 849 EDITOR:
850 EDITOR: 850 EDITOR:
851 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. 851 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
939 1 hunks, 2 lines changed 939 1 hunks, 2 lines changed
940 examine changes to 'file2'? 940 examine changes to 'file2'?
941 (enter ? for help) [Ynesfdaq?] a 941 (enter ? for help) [Ynesfdaq?] a
942 942
943 EDITOR: HG: Splitting 41c861dfa61e. So far it has been split into: 943 EDITOR: HG: Splitting 41c861dfa61e. So far it has been split into:
944 EDITOR: HG: - 4b19e06610eb: split1, keeping "file" and only the numbered lines in file2 944 EDITOR: HG: - 2:4b19e06610eb tip "split1, keeping "file" and only the numbered lines in file2"
945 EDITOR: HG: Write commit message for the next split changeset. 945 EDITOR: HG: Write commit message for the next split changeset.
946 EDITOR: copy file->file2, modify both 946 EDITOR: copy file->file2, modify both
947 EDITOR: 947 EDITOR:
948 EDITOR: 948 EDITOR:
949 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. 949 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.