mercurial: tests/test-rebase-parameters.t@4f36738a869a (annotated)

12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	1	$ cat >> $HGRCPATH <<EOF
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	2	> [extensions]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	3	> rebase=
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	4	>
15742 65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15270 diff changeset	5	> [phases]
65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15270 diff changeset	6	> publish=False
65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15270 diff changeset	7	>
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	8	> [alias]
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	9	> tglog = log -G --template "{rev}: {node\|short} '{desc}' {branches}\n"
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	10	> EOF
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	11
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	12
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	13	$ hg init a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	14	$ cd a
16350 4f795f5fbb0b tests: make tests work if directory contains special characters Thomas Arendsen Hein <thomas@intevation.de> parents: 15742 diff changeset	15	$ hg unbundle "$TESTDIR/bundles/rebase.hg"
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	16	adding changesets
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	17	adding manifests
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	18	adding file changes
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	19	added 8 changesets with 7 changes to 7 files (+2 heads)
39480 89630d0b3e23 phase: report number of non-public changeset alongside the new range Boris Feld <boris.feld@octobus.net> parents: 39098 diff changeset	20	new changesets cd010b8cd998:02de42196ebe (8 drafts)
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	21	(run 'hg heads' to see heads, 'hg merge' to merge)
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	22	$ hg up tip
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	23	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	24
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	25	$ echo I > I
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	26	$ hg ci -AmI
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	27	adding I
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	28
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	29	$ hg tglog
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	30	@ 8: e7ec4e813ba6 'I'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	31	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	32	o 7: 02de42196ebe 'H'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	33	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	34	\| o 6: eea13746799a 'G'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	35	\|/\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	36	o \| 5: 24b6387c8c8c 'F'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	37	\| \|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	38	\| o 4: 9520eea781bc 'E'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	39	\|/
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	40	\| o 3: 32af7686d403 'D'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	41	\| \|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	42	\| o 2: 5fddd98957c8 'C'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	43	\| \|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	44	\| o 1: 42ccdea3bb16 'B'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	45	\|/
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	46	o 0: cd010b8cd998 'A'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	47
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	48	$ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	49
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	50	Version with only two heads (to allow default destination to work)
ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	51
ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	52	$ hg clone -q -u . a a2heads -r 3 -r 8
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	53
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	54	These fail:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	55
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	56	$ hg clone -q -u . a a0
ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	57	$ cd a0
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	58
14123 7d1b637738a3 tests: move testcase from rebase-named-branches to rebase-parameters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14122 diff changeset	59	$ hg rebase -s 8 -d 7
15267 3bfdfefea2fc rebase: use revset as soon as possible in internal logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15132 diff changeset	60	nothing to rebase
3bfdfefea2fc rebase: use revset as soon as possible in internal logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15132 diff changeset	61	[1]
14123 7d1b637738a3 tests: move testcase from rebase-named-branches to rebase-parameters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14122 diff changeset	62
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	63	$ hg rebase --continue --abort
43899 fff21278554b rebase: use cmdutil.check_at_most_one_arg() for action Martin von Zweigbergk <martinvonz@google.com> parents: 43114 diff changeset	64	abort: cannot specify both --abort and --continue
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 45826 diff changeset	65	[10]
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	66
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	67	$ hg rebase --continue --collapse
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	68	abort: cannot use collapse with continue or abort
46632 9989a276712f errors: use more specific errors in rebase extension Martin von Zweigbergk <martinvonz@google.com> parents: 45840 diff changeset	69	[10]
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	70
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	71	$ hg rebase --continue --dest 4
43931 8c87cc169946 rebase: use cmdutil.check_at_most_one_arg() for action+revision Martin von Zweigbergk <martinvonz@google.com> parents: 43929 diff changeset	72	abort: cannot specify both --continue and --dest
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 45826 diff changeset	73	[10]
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	74
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	75	$ hg rebase --base 5 --source 4
43929 08b8bf4a8516 rebase: use cmdutil.check_at_most_one_arg() for -b/-s/-r Martin von Zweigbergk <martinvonz@google.com> parents: 43899 diff changeset	76	abort: cannot specify both --source and --base
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 45826 diff changeset	77	[10]
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	78
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	79	$ hg rebase --rev 5 --source 4
43929 08b8bf4a8516 rebase: use cmdutil.check_at_most_one_arg() for -b/-s/-r Martin von Zweigbergk <martinvonz@google.com> parents: 43899 diff changeset	80	abort: cannot specify both --rev and --source
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 45826 diff changeset	81	[10]
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	82	$ hg rebase --base 5 --rev 4
43929 08b8bf4a8516 rebase: use cmdutil.check_at_most_one_arg() for -b/-s/-r Martin von Zweigbergk <martinvonz@google.com> parents: 43899 diff changeset	83	abort: cannot specify both --rev and --base
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 45826 diff changeset	84	[10]
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	85
28190 e8d1460e2a72 rebase: explicitly test abort from ambiguous destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	86	$ hg rebase --base 6
e8d1460e2a72 rebase: explicitly test abort from ambiguous destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	87	abort: branch 'default' has 3 heads - please rebase to an explicit rev
43114 8197b395710e destutil: provide hint on rebase+merge for how to specify destination/rev Kyle Lippincott <spectral@google.com> parents: 40865 diff changeset	88	(run 'hg heads .' to see heads, specify destination with -d)
28190 e8d1460e2a72 rebase: explicitly test abort from ambiguous destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	89	[255]
e8d1460e2a72 rebase: explicitly test abort from ambiguous destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	90
28101 79437fb352ce tests: add an explicit destination in some rebase tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 28100 diff changeset	91	$ hg rebase --rev '1 & !1' --dest 8
21197 cb4223c65f79 rebase: don't abort if we're asked to rebase an empty revset Julien Cristau <julien.cristau@logilab.fr> parents: 20249 diff changeset	92	empty "rev" revision set - nothing to rebase
cb4223c65f79 rebase: don't abort if we're asked to rebase an empty revset Julien Cristau <julien.cristau@logilab.fr> parents: 20249 diff changeset	93	[1]
20247 a259f7b488ab rebase: improve error message for empty --rev set Mads Kiilerich <madski@unity3d.com> parents: 20246 diff changeset	94
44238 6e4ff6a766c2 tests: add tests for rebasing wdir() revision Martin von Zweigbergk <martinvonz@google.com> parents: 43931 diff changeset	95	$ hg rebase --rev 'wdir()' --dest 6
44239 830eae18b2f3 rebase: abort if the user tries to rebase the working copy Martin von Zweigbergk <martinvonz@google.com> parents: 44238 diff changeset	96	abort: cannot rebase the working copy
46632 9989a276712f errors: use more specific errors in rebase extension Martin von Zweigbergk <martinvonz@google.com> parents: 45840 diff changeset	97	[10]
44238 6e4ff6a766c2 tests: add tests for rebasing wdir() revision Martin von Zweigbergk <martinvonz@google.com> parents: 43931 diff changeset	98
44239 830eae18b2f3 rebase: abort if the user tries to rebase the working copy Martin von Zweigbergk <martinvonz@google.com> parents: 44238 diff changeset	99	$ hg rebase --source 'wdir()' --dest 6
830eae18b2f3 rebase: abort if the user tries to rebase the working copy Martin von Zweigbergk <martinvonz@google.com> parents: 44238 diff changeset	100	abort: cannot rebase the working copy
46632 9989a276712f errors: use more specific errors in rebase extension Martin von Zweigbergk <martinvonz@google.com> parents: 45840 diff changeset	101	[10]
44238 6e4ff6a766c2 tests: add tests for rebasing wdir() revision Martin von Zweigbergk <martinvonz@google.com> parents: 43931 diff changeset	102
44555 05654ea5137c rebase: accept multiple --source arguments (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 44347 diff changeset	103	$ hg rebase --source 1 --source 'wdir()' --dest 6
05654ea5137c rebase: accept multiple --source arguments (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 44347 diff changeset	104	abort: cannot rebase the working copy
46632 9989a276712f errors: use more specific errors in rebase extension Martin von Zweigbergk <martinvonz@google.com> parents: 45840 diff changeset	105	[10]
44555 05654ea5137c rebase: accept multiple --source arguments (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 44347 diff changeset	106
28101 79437fb352ce tests: add an explicit destination in some rebase tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 28100 diff changeset	107	$ hg rebase --source '1 & !1' --dest 8
21210 799c494189a9 rebase: empty revset should be a gentle no-op with exit code 1, not an error Mads Kiilerich <madski@unity3d.com> parents: 21197 diff changeset	108	empty "source" revision set - nothing to rebase
799c494189a9 rebase: empty revset should be a gentle no-op with exit code 1, not an error Mads Kiilerich <madski@unity3d.com> parents: 21197 diff changeset	109	[1]
20248 3bff26f67169 rebase: improve error message for empty --source set Mads Kiilerich <madski@unity3d.com> parents: 20247 diff changeset	110
28101 79437fb352ce tests: add an explicit destination in some rebase tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 28100 diff changeset	111	$ hg rebase --base '1 & !1' --dest 8
21210 799c494189a9 rebase: empty revset should be a gentle no-op with exit code 1, not an error Mads Kiilerich <madski@unity3d.com> parents: 21197 diff changeset	112	empty "base" revision set - can't compute rebase set
799c494189a9 rebase: empty revset should be a gentle no-op with exit code 1, not an error Mads Kiilerich <madski@unity3d.com> parents: 21197 diff changeset	113	[1]
20249 dc5157841361 rebase: improve error message for --base being empty or causing emptiness Mads Kiilerich <madski@unity3d.com> parents: 20248 diff changeset	114
28101 79437fb352ce tests: add an explicit destination in some rebase tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 28100 diff changeset	115	$ hg rebase --dest 8
20249 dc5157841361 rebase: improve error message for --base being empty or causing emptiness Mads Kiilerich <madski@unity3d.com> parents: 20248 diff changeset	116	nothing to rebase - working directory parent is also destination
dc5157841361 rebase: improve error message for --base being empty or causing emptiness Mads Kiilerich <madski@unity3d.com> parents: 20248 diff changeset	117	[1]
dc5157841361 rebase: improve error message for --base being empty or causing emptiness Mads Kiilerich <madski@unity3d.com> parents: 20248 diff changeset	118
28101 79437fb352ce tests: add an explicit destination in some rebase tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 28100 diff changeset	119	$ hg rebase -b . --dest 8
20249 dc5157841361 rebase: improve error message for --base being empty or causing emptiness Mads Kiilerich <madski@unity3d.com> parents: 20248 diff changeset	120	nothing to rebase - e7ec4e813ba6 is both "base" and destination
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	121	[1]
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	122
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	123	$ hg up -q 7
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	124
28101 79437fb352ce tests: add an explicit destination in some rebase tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 28100 diff changeset	125	$ hg rebase --dest 8 --traceback
20249 dc5157841361 rebase: improve error message for --base being empty or causing emptiness Mads Kiilerich <madski@unity3d.com> parents: 20248 diff changeset	126	nothing to rebase - working directory parent is already an ancestor of destination e7ec4e813ba6
dc5157841361 rebase: improve error message for --base being empty or causing emptiness Mads Kiilerich <madski@unity3d.com> parents: 20248 diff changeset	127	[1]
dc5157841361 rebase: improve error message for --base being empty or causing emptiness Mads Kiilerich <madski@unity3d.com> parents: 20248 diff changeset	128
28101 79437fb352ce tests: add an explicit destination in some rebase tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 28100 diff changeset	129	$ hg rebase --dest 8 -b.
20249 dc5157841361 rebase: improve error message for --base being empty or causing emptiness Mads Kiilerich <madski@unity3d.com> parents: 20248 diff changeset	130	nothing to rebase - "base" 02de42196ebe is already an ancestor of destination e7ec4e813ba6
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	131	[1]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	132
20246 e4dc4c89b03a rebase: test for empty dest revision Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	133	$ hg rebase --dest '1 & !1'
e4dc4c89b03a rebase: test for empty dest revision Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	134	abort: empty revision set
48030 7d908ee19b5b errors: use InputError for some invalid revsets and such Martin von Zweigbergk <martinvonz@google.com> parents: 46632 diff changeset	135	[10]
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	136
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	137	These work:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	138
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	139	Rebase with no arguments (from 3 onto 8):
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	140
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	141	$ cd ..
ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	142	$ hg clone -q -u . a2heads a1
ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	143	$ cd a1
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	144	$ hg up -q -C 3
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	145
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	146	$ hg rebase
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	147	rebasing 1:42ccdea3bb16 "B"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	148	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	149	rebasing 3:32af7686d403 "D"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	150	saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	151
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	152	$ hg tglog
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	153	@ 6: ed65089c18f8 'D'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	154	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	155	o 5: 7621bf1a2f17 'C'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	156	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	157	o 4: 9430a62369c6 'B'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	158	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	159	o 3: e7ec4e813ba6 'I'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	160	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	161	o 2: 02de42196ebe 'H'
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	162	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	163	o 1: 24b6387c8c8c 'F'
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	164	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	165	o 0: cd010b8cd998 'A'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	166
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	167	Try to rollback after a rebase (fail):
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	168
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	169	$ hg rollback
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	170	no rollback information available
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	171	[1]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	172
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	173	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	174
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	175	Rebase with base == '.' => same as no arguments (from 3 onto 8):
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	176
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	177	$ hg clone -q -u 3 a2heads a2
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	178	$ cd a2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	179
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	180	$ hg rebase --base .
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	181	rebasing 1:42ccdea3bb16 "B"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	182	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	183	rebasing 3:32af7686d403 "D"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	184	saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	185
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	186	$ hg tglog
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	187	@ 6: ed65089c18f8 'D'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	188	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	189	o 5: 7621bf1a2f17 'C'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	190	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	191	o 4: 9430a62369c6 'B'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	192	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	193	o 3: e7ec4e813ba6 'I'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	194	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	195	o 2: 02de42196ebe 'H'
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	196	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	197	o 1: 24b6387c8c8c 'F'
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	198	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	199	o 0: cd010b8cd998 'A'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	200
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	201	$ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	202
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	203
16566 ae6dddffe4f1 rebase: make --dest understand revsets Patrick Mezard <patrick@mezard.eu> parents: 16550 diff changeset	204	Rebase with dest == branch(.) => same as no arguments (from 3 onto 8):
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	205
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	206	$ hg clone -q -u 3 a a3
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	207	$ cd a3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	208
16566 ae6dddffe4f1 rebase: make --dest understand revsets Patrick Mezard <patrick@mezard.eu> parents: 16550 diff changeset	209	$ hg rebase --dest 'branch(.)'
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	210	rebasing 1:42ccdea3bb16 "B"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	211	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	212	rebasing 3:32af7686d403 "D"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	213	saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	214
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	215	$ hg tglog
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	216	@ 8: ed65089c18f8 'D'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	217	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	218	o 7: 7621bf1a2f17 'C'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	219	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	220	o 6: 9430a62369c6 'B'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	221	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	222	o 5: e7ec4e813ba6 'I'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	223	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	224	o 4: 02de42196ebe 'H'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	225	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	226	\| o 3: eea13746799a 'G'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	227	\|/\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	228	o \| 2: 24b6387c8c8c 'F'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	229	\| \|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	230	\| o 1: 9520eea781bc 'E'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	231	\|/
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	232	o 0: cd010b8cd998 'A'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	233
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	234	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	235
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	236
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	237	Specify only source (from 2 onto 8):
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	238
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	239	$ hg clone -q -u . a2heads a4
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	240	$ cd a4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	241
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	242	$ hg rebase --source 'desc("C")'
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	243	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	244	rebasing 3:32af7686d403 "D"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	245	saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	246
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	247	$ hg tglog
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	248	o 6: 7726e9fd58f7 'D'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	249	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	250	o 5: 72c8333623d0 'C'
17005 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16913 diff changeset	251	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	252	@ 4: e7ec4e813ba6 'I'
17005 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16913 diff changeset	253	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	254	o 3: 02de42196ebe 'H'
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	255	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	256	o 2: 24b6387c8c8c 'F'
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	257	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	258	\| o 1: 42ccdea3bb16 'B'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	259	\|/
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	260	o 0: cd010b8cd998 'A'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	261
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	262	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	263
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	264
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	265	Specify only dest (from 3 onto 6):
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	266
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	267	$ hg clone -q -u 3 a a5
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	268	$ cd a5
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	269
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	270	$ hg rebase --dest 6
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	271	rebasing 1:42ccdea3bb16 "B"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	272	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	273	rebasing 3:32af7686d403 "D"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	274	saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
7130 204c7850c158 rebase: disable rollback after rebasing Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6939 diff changeset	275
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	276	$ hg tglog
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	277	@ 8: 8eeb3c33ad33 'D'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	278	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	279	o 7: 2327fea05063 'C'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	280	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	281	o 6: e4e5be0395b2 'B'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	282	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	283	\| o 5: e7ec4e813ba6 'I'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	284	\| \|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	285	\| o 4: 02de42196ebe 'H'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	286	\| \|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	287	o \| 3: eea13746799a 'G'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	288	\|\\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	289	\| o 2: 24b6387c8c8c 'F'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	290	\| \|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	291	o \| 1: 9520eea781bc 'E'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	292	\|/
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	293	o 0: cd010b8cd998 'A'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	294
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	295	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	296
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	297
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	298	Specify only base (from 1 onto 8):
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	299
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	300	$ hg clone -q -u . a2heads a6
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	301	$ cd a6
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	302
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	303	$ hg rebase --base 'desc("D")'
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	304	rebasing 1:42ccdea3bb16 "B"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	305	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	306	rebasing 3:32af7686d403 "D"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	307	saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	308
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	309	$ hg tglog
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	310	o 6: ed65089c18f8 'D'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	311	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	312	o 5: 7621bf1a2f17 'C'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	313	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	314	o 4: 9430a62369c6 'B'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	315	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	316	@ 3: e7ec4e813ba6 'I'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	317	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	318	o 2: 02de42196ebe 'H'
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	319	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	320	o 1: 24b6387c8c8c 'F'
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	321	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	322	o 0: cd010b8cd998 'A'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	323
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	324	$ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	325
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	326
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	327	Specify source and dest (from 2 onto 7):
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	328
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	329	$ hg clone -q -u . a a7
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	330	$ cd a7
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	331
17005 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16913 diff changeset	332	$ hg rebase --source 2 --dest 7
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	333	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	334	rebasing 3:32af7686d403 "D"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	335	saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	336
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	337	$ hg tglog
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	338	o 8: 668acadedd30 'D'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	339	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	340	o 7: 09eb682ba906 'C'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	341	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	342	\| @ 6: e7ec4e813ba6 'I'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	343	\|/
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	344	o 5: 02de42196ebe 'H'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	345	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	346	\| o 4: eea13746799a 'G'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	347	\|/\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	348	o \| 3: 24b6387c8c8c 'F'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	349	\| \|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	350	\| o 2: 9520eea781bc 'E'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	351	\|/
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	352	\| o 1: 42ccdea3bb16 'B'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	353	\|/
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	354	o 0: cd010b8cd998 'A'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	355
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	356	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	357
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	358
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	359	Specify base and dest (from 1 onto 7):
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	360
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	361	$ hg clone -q -u . a a8
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	362	$ cd a8
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	363
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	364	$ hg rebase --base 3 --dest 7
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	365	rebasing 1:42ccdea3bb16 "B"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	366	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	367	rebasing 3:32af7686d403 "D"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	368	saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	369
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	370	$ hg tglog
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	371	o 8: 287cc92ba5a4 'D'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	372	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	373	o 7: 6824f610a250 'C'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	374	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	375	o 6: 7c6027df6a99 'B'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	376	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	377	\| @ 5: e7ec4e813ba6 'I'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	378	\|/
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	379	o 4: 02de42196ebe 'H'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	380	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	381	\| o 3: eea13746799a 'G'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	382	\|/\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	383	o \| 2: 24b6387c8c8c 'F'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	384	\| \|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	385	\| o 1: 9520eea781bc 'E'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	386	\|/
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	387	o 0: cd010b8cd998 'A'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	388
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	389	$ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	390
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	391
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	392	Specify only revs (from 2 onto 8)
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	393
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	394	$ hg clone -q -u . a2heads a9
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	395	$ cd a9
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	396
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	397	$ hg rebase --rev 'desc("C")::'
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	398	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	399	rebasing 3:32af7686d403 "D"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	400	saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	401
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	402	$ hg tglog
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	403	o 6: 7726e9fd58f7 'D'
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	404	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	405	o 5: 72c8333623d0 'C'
17005 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16913 diff changeset	406	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	407	@ 4: e7ec4e813ba6 'I'
17005 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16913 diff changeset	408	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	409	o 3: 02de42196ebe 'H'
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	410	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	411	o 2: 24b6387c8c8c 'F'
28100 ab382192337a tests: remove third head in some of the 'rebase-parameters' tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 27963 diff changeset	412	\|
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	413	\| o 1: 42ccdea3bb16 'B'
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	414	\|/
35385 469b06b4c3ca tests: add commit hashes to log commands in rebase tests Phil Cohen <phillco@fb.com> parents: 34661 diff changeset	415	o 0: cd010b8cd998 'A'
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	416
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	417	$ cd ..
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	418
27963 07a5de79ec30 rebase: better way to detect non-detaching revisions (issue5044) Martijn Pieters <mj@zopatista.com> parents: 27626 diff changeset	419	Rebasing both a single revision and a merge in one command
07a5de79ec30 rebase: better way to detect non-detaching revisions (issue5044) Martijn Pieters <mj@zopatista.com> parents: 27626 diff changeset	420
07a5de79ec30 rebase: better way to detect non-detaching revisions (issue5044) Martijn Pieters <mj@zopatista.com> parents: 27626 diff changeset	421	$ hg clone -q -u . a aX
07a5de79ec30 rebase: better way to detect non-detaching revisions (issue5044) Martijn Pieters <mj@zopatista.com> parents: 27626 diff changeset	422	$ cd aX
28101 79437fb352ce tests: add an explicit destination in some rebase tests Pierre-Yves David <pierre-yves.david@fb.com> parents: 28100 diff changeset	423	$ hg rebase -r 3 -r 6 --dest 8
27963 07a5de79ec30 rebase: better way to detect non-detaching revisions (issue5044) Martijn Pieters <mj@zopatista.com> parents: 27626 diff changeset	424	rebasing 3:32af7686d403 "D"
07a5de79ec30 rebase: better way to detect non-detaching revisions (issue5044) Martijn Pieters <mj@zopatista.com> parents: 27626 diff changeset	425	rebasing 6:eea13746799a "G"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	426	saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-rebase.hg
27963 07a5de79ec30 rebase: better way to detect non-detaching revisions (issue5044) Martijn Pieters <mj@zopatista.com> parents: 27626 diff changeset	427	$ cd ..
07a5de79ec30 rebase: better way to detect non-detaching revisions (issue5044) Martijn Pieters <mj@zopatista.com> parents: 27626 diff changeset	428
13856 0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	429	Test --tool parameter:
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	430
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	431	$ hg init b
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	432	$ cd b
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	433
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	434	$ echo c1 > c1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	435	$ hg ci -Am c1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	436	adding c1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	437
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	438	$ echo c2 > c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	439	$ hg ci -Am c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	440	adding c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	441
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	442	$ hg up -q 0
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	443	$ echo c2b > c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	444	$ hg ci -Am c2b
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	445	adding c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	446	created new head
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	447
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	448	$ cd ..
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	449
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	450	$ hg clone -q -u . b b1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	451	$ cd b1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	452
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	453	$ hg rebase -s 2 -d 1 --tool internal:local
45771 f90a5c211251 rebase: change and standarize template for rebase's one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 45150 diff changeset	454	rebasing 2:e4e3f3546619 tip "c2b"
f90a5c211251 rebase: change and standarize template for rebase's one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 45150 diff changeset	455	note: not rebasing 2:e4e3f3546619 tip "c2b", its destination already has all its changes
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	456	saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
13856 0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	457
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	458	$ hg cat c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	459	c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	460
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	461	$ cd ..
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	462
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	463
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	464	$ hg clone -q -u . b b2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	465	$ cd b2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	466
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	467	$ hg rebase -s 2 -d 1 --tool internal:other
45771 f90a5c211251 rebase: change and standarize template for rebase's one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 45150 diff changeset	468	rebasing 2:e4e3f3546619 tip "c2b"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	469	saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
13856 0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	470
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	471	$ hg cat c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	472	c2b
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	473
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	474	$ cd ..
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	475
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	476
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	477	$ hg clone -q -u . b b3
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	478	$ cd b3
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	479
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	480	$ hg rebase -s 2 -d 1 --tool internal:fail
45771 f90a5c211251 rebase: change and standarize template for rebase's one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 45150 diff changeset	481	rebasing 2:e4e3f3546619 tip "c2b"
45150 dc5e5577af39 error: unify the error message formats for 'rebase' and 'unshelve' Daniel Ploch <dploch@google.com> parents: 44555 diff changeset	482	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
45826 21733e8c924f errors: add config that lets user get more detailed exit codes Martin von Zweigbergk <martinvonz@google.com> parents: 45771 diff changeset	483	[240]
13856 0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	484
19213 f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	485	$ hg summary
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	486	parent: 1:56daeba07f4b
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	487	c2
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	488	branch: default
44347 9c9cfecd4600 rebase: don't use rebased node as dirstate p2 (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 44239 diff changeset	489	commit: 1 unresolved (clean)
9c9cfecd4600 rebase: don't use rebased node as dirstate p2 (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 44239 diff changeset	490	update: 1 new changesets, 2 branch heads (merge)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25111 diff changeset	491	phases: 3 draft
19214 0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19213 diff changeset	492	rebase: 0 rebased, 1 remaining (rebase --continue)
19213 f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	493
13856 0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	494	$ hg resolve -l
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	495	U c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	496
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	497	$ hg resolve -m c2
21947 b081decd9062 resolve: add parenthesis around "no more unresolved files" message Pierre-Yves David <pierre-yves.david@fb.com> parents: 21267 diff changeset	498	(no more unresolved files)
27626 157675d0f600 rebase: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 26496 diff changeset	499	continue: hg rebase --continue
28122 6025ddb4e649 rebase: suggest the correct tool to continue (not rebase) timeless <timeless@mozdev.org> parents: 28101 diff changeset	500	$ hg graft --continue
6025ddb4e649 rebase: suggest the correct tool to continue (not rebase) timeless <timeless@mozdev.org> parents: 28101 diff changeset	501	abort: no graft in progress
6025ddb4e649 rebase: suggest the correct tool to continue (not rebase) timeless <timeless@mozdev.org> parents: 28101 diff changeset	502	(continue: hg rebase --continue)
45840 527ce85c2e60 errors: introduce StateError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 45827 diff changeset	503	[20]
13856 0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	504	$ hg rebase -c --tool internal:fail
45771 f90a5c211251 rebase: change and standarize template for rebase's one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 45150 diff changeset	505	rebasing 2:e4e3f3546619 tip "c2b"
f90a5c211251 rebase: change and standarize template for rebase's one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 45150 diff changeset	506	note: not rebasing 2:e4e3f3546619 tip "c2b", its destination already has all its changes
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35385 diff changeset	507	saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
13856 0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	508
22382 d5b04ee8ecf7 rebase: add a deprecated -i/--interactive flag David Soria Parra <davidsp@fb.com> parents: 21947 diff changeset	509	$ hg rebase -i
26496 b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	510	abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit")
46632 9989a276712f errors: use more specific errors in rebase extension Martin von Zweigbergk <martinvonz@google.com> parents: 45840 diff changeset	511	[10]
22382 d5b04ee8ecf7 rebase: add a deprecated -i/--interactive flag David Soria Parra <davidsp@fb.com> parents: 21947 diff changeset	512
d5b04ee8ecf7 rebase: add a deprecated -i/--interactive flag David Soria Parra <davidsp@fb.com> parents: 21947 diff changeset	513	$ hg rebase --interactive
26496 b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	514	abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit")
46632 9989a276712f errors: use more specific errors in rebase extension Martin von Zweigbergk <martinvonz@google.com> parents: 45840 diff changeset	515	[10]
22382 d5b04ee8ecf7 rebase: add a deprecated -i/--interactive flag David Soria Parra <davidsp@fb.com> parents: 21947 diff changeset	516
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16566 diff changeset	517	$ cd ..
23246 643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	518
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	519	No common ancestor
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	520
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	521	$ hg init separaterepo
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	522	$ cd separaterepo
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	523	$ touch a
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	524	$ hg commit -Aqm a
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	525	$ hg up -q null
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	526	$ touch b
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	527	$ hg commit -Aqm b
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	528	$ hg rebase -d 0
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	529	nothing to rebase from d7486e00c6f1 to 3903775176ed
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	530	[1]
643c58303fb0 rebase: fix rebase with no common ancestors (issue4446) Durham Goode <durham@fb.com> parents: 22382 diff changeset	531	$ cd ..

author	pacien <pacien.trangirard@pacien.net>
	Thu, 22 Sep 2022 16:09:53 +0200
changeset 49499	4f36738a869a
parent 48030	7d908ee19b5b
permissions	-rw-r--r--