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

6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1	@ 7: H
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 6: G
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 \| 5: F
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 4: E
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 3: D
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 2: C
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	\| o 1: B
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	14	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	15	o 0: A
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	16
7278 45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	17	% Rebasing B onto H
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	18	3 files updated, 0 files merged, 2 files removed, 0 files unresolved
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	19	saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	20	adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	21	adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	22	adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	23	adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	24	added 5 changesets with 6 changes to 6 files (+1 heads)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	25	rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	26	@ 5: Collapsed revision
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	27	\| * B
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	28	\| * C
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	29	\| * D
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	30	o 4: H
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 3: G
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	o \| 2: F
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	35	\| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	36	\| o 1: E
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	37	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	38	o 0: A
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	39
7278 45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	40	Expected A, B, C, D, F, H
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	41	A
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	42	B
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	43	C
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	44	D
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	45	F
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	46	H
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	47
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	48	% Rebasing G onto H
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	49	saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	50	adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	51	adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	52	adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	53	adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	54	added 3 changesets with 3 changes to 3 files (+1 heads)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	55	rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	56	@ 6: Collapsed revision
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	57	\| * E
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	58	\| * G
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	59	o 5: H
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	60	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	61	o 4: F
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	62	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	63	\| o 3: D
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	64	\| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	65	\| o 2: C
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	66	\| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	67	\| o 1: B
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	68	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	69	o 0: A
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	70
7278 45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	71	Expected A, E, F, H
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	72	A
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	73	E
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	74	F
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	75	H
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	76
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	77	@ 7: H
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	78	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	79	\| o 6: G
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	80	\| \|\
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	81	\| \| o 5: F
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	82	\| \| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	83	\| \| o 4: E
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	84	\| \| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	85	\| o \| 3: D
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	86	\| \|\\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	87	\| o \| 2: C
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	88	\|/ /
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	89	\| o 1: B
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	90	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	91	o 0: A
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	92
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	93
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	94	% Rebase and collapse - more than one external (fail)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	95	abort: unable to collapse, there is more than one external parent
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	96
7278 45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	97	% Rebase and collapse - E onto H
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	98	saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	99	adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	100	adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	101	adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	102	adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	103	added 2 changesets with 3 changes to 3 files
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	104	rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	105	@ 5: Collapsed revision
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	106	\|\ * E
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	107	\| \| * F
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	108	\| \| * G
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	109	\| o 4: H
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	110	\| \|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	111	o \| 3: D
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	112	\|\ \
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	113	\| o \| 2: C
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	114	\| \|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	115	o / 1: B
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	116	\|/
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	117	o 0: A
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	118
7278 45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	119	Expected A, B, C, E, F, H
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	120	A
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	121	B
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	122	C
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	123	E
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	124	F
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	125	H
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	126
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	127	@ 8: I
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	128	\|
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	129	\| o 7: H
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	130	\| \|\
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	131	\| \| o 6: G
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	132	\| \| \|
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	133	\| \| o 5: F
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	134	\| \| \|
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	135	\| \| o 4: E
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	136	\| \| \|
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	137	\| o \| 3: D
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	138	\| \|\\|
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	139	\| o \| 2: C
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	140	\|/ /
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	141	\| o 1: B
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	142	\|/
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	143	o 0: A
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	144
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	145
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	146	% Rebase and collapse - E onto I
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	147	merging E
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	148	saving bundle to
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	149	adding branch
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	150	adding changesets
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	151	adding manifests
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	152	adding file changes
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	153	added 2 changesets with 3 changes to 3 files
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	154	rebase completed
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	155	@ 5: Collapsed revision
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	156	\|\ * E
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	157	\| \| * F
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	158	\| \| * G
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	159	\| \| * H
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	160	\| o 4: I
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	161	\| \|
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	162	o \| 3: D
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	163	\|\ \
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	164	\| o \| 2: C
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	165	\| \|/
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	166	o / 1: B
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	167	\|/
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	168	o 0: A
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	169
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	170	Expected A, B, C, E, G, I
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	171	A
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	172	B
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	173	C
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	174	E
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	175	G
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	176	I
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	177	Cat E:
9815 49efeed49c94 rebase: make sure the newancestor is used during the whole update Christian Boos <cboos@bct-technology.com> parents: 7278 diff changeset	178	F
7278 45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	179
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	180	@ 5: F
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	181	\|
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	182	\| o 4: E
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	183	\| \|\
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	184	\| \| o 3: D
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	185	\| \| \|
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	186	\| o \| 2: C
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	187	\| \|/
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	188	\| o 1: B
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	189	\|/
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	190	o 0: A
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	191
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	192
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	193	% Rebase and collapse - B onto F
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	194	saving bundle to
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	195	adding branch
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	196	adding changesets
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	197	adding manifests
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	198	adding file changes
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	199	added 2 changesets with 4 changes to 4 files
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	200	rebase completed
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	201	@ 2: Collapsed revision
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	202	\| * B
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	203	\| * C
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	204	\| * D
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	205	\| * E
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	206	o 1: F
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	207	\|
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	208	o 0: A
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	209
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	210	Expected A, B, C, D, F
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	211	A
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	212	B
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	213	C
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	214	D
45495d784ad6 rebase: avoid redundant merges (issue1301) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	215	F

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