mercurial: tests/test-rebase-scenario-global.out@439d7ea6fe3a (annotated)

6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1	@ 5: F
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	2	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	3	\| o 4: E
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	4	\|/\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	5	o \| 3: D
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	6	\| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	7	\| o 2: C
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	8	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	9	\| o 1: B
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	10	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	11	o 0: A
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	12
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	13	% Rebasing
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	14	% B onto F - simple rebase
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	15	saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	16	adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	17	adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	18	adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	19	adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	20	added 5 changesets with 4 changes to 4 files (+1 heads)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	21	rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	22	@ 5: B
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	23	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	24	o 4: F
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	25	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	26	\| o 3: E
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	27	\|/\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	28	o \| 2: D
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	29	\| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	30	\| o 1: C
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	31	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	32	o 0: A
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	33
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	34	% B onto D - intermediate point
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	35	saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	36	adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	37	adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	38	adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	39	adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	40	added 5 changesets with 4 changes to 4 files (+2 heads)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	41	rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	42	@ 5: B
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	43	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	44	\| o 4: F
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	45	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	46	\| o 3: E
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	47	\|/\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	48	o \| 2: D
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	49	\| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	50	\| o 1: C
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	51	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	52	o 0: A
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	53
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	54	% C onto F - skip of E
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	55	saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	56	adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	57	adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	58	adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	59	adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	60	added 3 changesets with 3 changes to 3 files (+1 heads)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	61	rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	62	@ 4: C
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	63	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	64	o 3: F
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	65	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	66	o 2: D
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	67	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	68	\| o 1: B
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	69	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	70	o 0: A
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	71
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	72	% D onto C - rebase of a branching point (skip E)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	73	saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	74	adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	75	adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	76	adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	77	adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	78	added 2 changesets with 2 changes to 2 files
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	79	rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	80	@ 4: F
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	81	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	82	o 3: D
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	83	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	84	o 2: C
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	85	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	86	\| o 1: B
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	87	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	88	o 0: A
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	89
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	90	% E onto F - merged revision having a parent in ancestors of target
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	91	saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	92	adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	93	adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	94	adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	95	adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	96	added 2 changesets with 1 changes to 1 files (-1 heads)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	97	rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	98	@ 5: E
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	99	\|\
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	100	\| o 4: F
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	101	\| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	102	\| o 3: D
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	103	\| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	104	o \| 2: C
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	105	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	106	\| o 1: B
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	107	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	108	o 0: A
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	109
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	110	% D onto B - E maintains C as parent
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	111	saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	112	adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	113	adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	114	adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	115	adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	116	added 3 changesets with 2 changes to 2 files
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	117	rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	118	@ 5: F
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	119	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	120	\| o 4: E
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	121	\|/\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	122	o \| 3: D
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	123	\| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	124	\| o 2: C
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	125	\| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	126	o \| 1: B
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	127	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	128	o 0: A
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	129
9578 341182ac95e4 rebase: return early when source is descendant of destination Sune Foldager <cryo@cyanite.org> parents: 9577 diff changeset	130	% These will fail (using --source)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	131	% E onto D - rebase onto an ancestor
9577 b91960aed018 rebase: improve error and debug messages Sune Foldager <cryo@cyanite.org> parents: 8995 diff changeset	132	abort: source is descendant of destination
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	133	% D onto E - rebase onto a descendant
9577 b91960aed018 rebase: improve error and debug messages Sune Foldager <cryo@cyanite.org> parents: 8995 diff changeset	134	abort: source is ancestor of destination
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	135	% E onto B - merge revision with both parents not in ancestors of target
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	136	abort: cannot use revision 4 as base, result would have 3 parents
9578 341182ac95e4 rebase: return early when source is descendant of destination Sune Foldager <cryo@cyanite.org> parents: 9577 diff changeset	137
341182ac95e4 rebase: return early when source is descendant of destination Sune Foldager <cryo@cyanite.org> parents: 9577 diff changeset	138	% These will abort gracefully (using --base)
341182ac95e4 rebase: return early when source is descendant of destination Sune Foldager <cryo@cyanite.org> parents: 9577 diff changeset	139	% E onto E - rebase onto same changeset
341182ac95e4 rebase: return early when source is descendant of destination Sune Foldager <cryo@cyanite.org> parents: 9577 diff changeset	140	nothing to rebase
341182ac95e4 rebase: return early when source is descendant of destination Sune Foldager <cryo@cyanite.org> parents: 9577 diff changeset	141	% E onto D - rebase onto an ancestor
341182ac95e4 rebase: return early when source is descendant of destination Sune Foldager <cryo@cyanite.org> parents: 9577 diff changeset	142	nothing to rebase
341182ac95e4 rebase: return early when source is descendant of destination Sune Foldager <cryo@cyanite.org> parents: 9577 diff changeset	143	% D onto E - rebase onto a descendant
341182ac95e4 rebase: return early when source is descendant of destination Sune Foldager <cryo@cyanite.org> parents: 9577 diff changeset	144	nothing to rebase

author	Matt Mackall <mpm@selenic.com>
	Tue, 01 Dec 2009 19:28:15 -0600
branch	stable
changeset 9984	439d7ea6fe3a
parent 9578	341182ac95e4
child 11197	4bb4895e1693
permissions	-rw-r--r--