mercurial: tests/test-rebase-scenario-global.t@624e5ce615ec (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	> graphlog=
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	4	> rebase=
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	5	>
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	6	> [alias]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	7	> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	8	> EOF
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	9
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	10
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	11	$ hg init a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	12	$ cd a
14118 7fd8e597f99c tests: introduce a rebase bundle to use with rebase tests Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12640 diff changeset	13	$ hg unbundle $TESTDIR/bundles/rebase.hg
7fd8e597f99c tests: introduce a rebase bundle to use with rebase tests Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12640 diff changeset	14	adding changesets
7fd8e597f99c tests: introduce a rebase bundle to use with rebase tests Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12640 diff changeset	15	adding manifests
7fd8e597f99c tests: introduce a rebase bundle to use with rebase tests Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12640 diff changeset	16	adding file changes
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	17	added 8 changesets with 7 changes to 7 files (+2 heads)
14118 7fd8e597f99c tests: introduce a rebase bundle to use with rebase tests Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12640 diff changeset	18	(run 'hg heads' to see heads, 'hg merge' to merge)
7fd8e597f99c tests: introduce a rebase bundle to use with rebase tests Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12640 diff changeset	19	$ hg up tip
7fd8e597f99c tests: introduce a rebase bundle to use with rebase tests Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12640 diff changeset	20	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	21	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	22
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	23
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	24	Rebasing
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	25	D onto H - simple rebase:
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	26
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	27	$ hg clone -q -u . a a1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	28	$ cd a1
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	29
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	30	$ hg tglog
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	31	@ 7: 'H'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	32	\|
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	33	\| o 6: 'G'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	34	\|/\|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	35	o \| 5: 'F'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	36	\| \|
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	37	\| o 4: 'E'
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	38	\|/
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	39	\| o 3: 'D'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	40	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	41	\| o 2: 'C'
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	42	\| \|
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	43	\| o 1: 'B'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	44	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	45	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	46
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	47
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	48	$ hg rebase -s 3 -d 7
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12608 diff changeset	49	saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	50
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	51	$ hg tglog
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	52	@ 7: 'D'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	53	\|\
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	54	\| o 6: 'H'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	55	\| \|
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	56	\| \| o 5: 'G'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	57	\| \|/\|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	58	\| o \| 4: 'F'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	59	\| \| \|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	60	\| \| o 3: 'E'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	61	\| \|/
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	62	o \| 2: 'C'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	63	\| \|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	64	o \| 1: 'B'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	65	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	66	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	67
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	68	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	69
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	70
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	71	D onto F - intermediate point:
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	72
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	73	$ hg clone -q -u . a a2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	74	$ cd a2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	75
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	76	$ hg rebase -s 3 -d 5
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12608 diff changeset	77	saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	78
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	79	$ hg tglog
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	80	@ 7: 'D'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	81	\|\
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	82	\| \| o 6: 'H'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	83	\| \|/
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	84	\| \| o 5: 'G'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	85	\| \|/\|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	86	\| o \| 4: 'F'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	87	\| \| \|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	88	\| \| o 3: 'E'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	89	\| \|/
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	90	o \| 2: 'C'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	91	\| \|
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	92	o \| 1: 'B'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	93	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	94	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	95
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	96	$ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	97
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	98
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	99	E onto H - skip of G:
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	100
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	101	$ hg clone -q -u . a a3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	102	$ cd a3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	103
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	104	$ hg rebase -s 4 -d 7
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12608 diff changeset	105	saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	106
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	107	$ hg tglog
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	108	@ 6: 'E'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	109	\|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	110	o 5: 'H'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	111	\|
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	112	o 4: 'F'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	113	\|
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	114	\| o 3: 'D'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	115	\| \|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	116	\| o 2: 'C'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	117	\| \|
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	118	\| o 1: 'B'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	119	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	120	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	121
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	122	$ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	123
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	124
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	125	F onto E - rebase of a branching point (skip G):
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	126
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	127	$ hg clone -q -u . a a4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	128	$ cd a4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	129
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	130	$ hg rebase -s 5 -d 4
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12608 diff changeset	131	saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	132
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	133	$ hg tglog
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	134	@ 6: 'H'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	135	\|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	136	o 5: 'F'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	137	\|
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	138	o 4: 'E'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	139	\|
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	140	\| o 3: 'D'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	141	\| \|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	142	\| o 2: 'C'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	143	\| \|
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	144	\| o 1: 'B'
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	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	147
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	148	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	149
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	150
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	151	G onto H - merged revision having a parent in ancestors of target:
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	152
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	153	$ hg clone -q -u . a a5
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	154	$ cd a5
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	155
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	156	$ hg rebase -s 6 -d 7
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12608 diff changeset	157	saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	158
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	159	$ hg tglog
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	160	@ 7: 'G'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	161	\|\
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	162	\| o 6: 'H'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	163	\| \|
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	164	\| o 5: 'F'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	165	\| \|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	166	o \| 4: 'E'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	167	\|/
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	168	\| o 3: 'D'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	169	\| \|
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	170	\| o 2: 'C'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	171	\| \|
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	172	\| o 1: 'B'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	173	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	174	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	175
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	176	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	177
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	178
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	179	F onto B - G maintains E as parent:
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	180
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	181	$ hg clone -q -u . a a6
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	182	$ cd a6
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	183
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	184	$ hg rebase -s 5 -d 1
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12608 diff changeset	185	saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	186
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	187	$ hg tglog
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	188	@ 7: 'H'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	189	\|
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	190	\| o 6: 'G'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	191	\|/\|
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	192	o \| 5: 'F'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	193	\| \|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	194	\| o 4: 'E'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	195	\| \|
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	196	\| \| o 3: 'D'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	197	\| \| \|
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	198	+---o 2: 'C'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	199	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	200	o \| 1: 'B'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	201	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	202	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	203
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	204	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	205
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	206
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	207	These will fail (using --source):
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	208
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	209	G onto F - rebase onto an ancestor:
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	210
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	211	$ hg clone -q -u . a a7
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	212	$ cd a7
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	213
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	214	$ hg rebase -s 6 -d 5
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	215	abort: source is descendant of destination
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	216	[255]
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	217
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	218	F onto G - rebase onto a descendant:
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	219
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	220	$ hg rebase -s 5 -d 6
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	221	abort: source is ancestor of destination
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	222	[255]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	223
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	224	G onto B - merge revision with both parents not in ancestors of target:
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	225
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	226	$ hg rebase -s 6 -d 1
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	227	abort: cannot use revision 6 as base, result would have 3 parents
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	228	[255]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	229
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	230
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	231	These will abort gracefully (using --base):
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	232
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	233	G onto G - rebase onto same changeset:
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	234
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	235	$ hg rebase -b 6 -d 6
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	236	nothing to rebase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	237	[1]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	238
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	239	G onto F - rebase onto an ancestor:
9578 341182ac95e4 rebase: return early when source is descendant of destination Sune Foldager <cryo@cyanite.org> parents: 8168 diff changeset	240
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	241	$ hg rebase -b 6 -d 5
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	242	nothing to rebase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	243	[1]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	244
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	245	F onto G - rebase onto a descendant:
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	246
14119 624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14118 diff changeset	247	$ hg rebase -b 5 -d 6
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	248	nothing to rebase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	249	[1]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	250

author	Nicolas Dumazet <nicdumz.commits@gmail.com>
	Sat, 30 Apr 2011 17:38:06 +0200
changeset 14119	624e5ce615ec
parent 14118	7fd8e597f99c
child 15132	81f76098211e
permissions	-rw-r--r--