mercurial: tests/test-rebase-newancestor.t@65f215ea3e8e (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	>
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	5	> [alias]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	6	> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	7	> EOF
11198 b345b1cc124f rebase: use helpers.sh in tests Matt Mackall <mpm@selenic.com> parents: 9815 diff changeset	8
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	9	$ hg init repo
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	10	$ cd repo
9815 49efeed49c94 rebase: make sure the newancestor is used during the whole update Christian Boos <cboos@bct-technology.com> parents: diff changeset	11
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	12	$ echo A > a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	13	$ echo >> a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	14	$ hg ci -Am A
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	15	adding a
9815 49efeed49c94 rebase: make sure the newancestor is used during the whole update Christian Boos <cboos@bct-technology.com> parents: diff changeset	16
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	17	$ echo B > a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	18	$ echo >> a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	19	$ hg ci -m B
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	20
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	21	$ echo C > a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	22	$ echo >> a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	23	$ hg ci -m C
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	24
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	25	$ hg up -q -C 0
9815 49efeed49c94 rebase: make sure the newancestor is used during the whole update Christian Boos <cboos@bct-technology.com> parents: diff changeset	26
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	27	$ echo D >> a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	28	$ hg ci -Am AD
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	29	created new head
9815 49efeed49c94 rebase: make sure the newancestor is used during the whole update Christian Boos <cboos@bct-technology.com> parents: diff changeset	30
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	31	$ hg tglog
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	32	@ 3: 'AD'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	33	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	34	\| o 2: 'C'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	35	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	36	\| o 1: 'B'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	37	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	38	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	39
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	40	$ hg rebase -s 1 -d 3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	41	merging a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	42	merging a
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12608 diff changeset	43	saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)
9815 49efeed49c94 rebase: make sure the newancestor is used during the whole update Christian Boos <cboos@bct-technology.com> parents: diff changeset	44
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	45	$ hg tglog
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16913 diff changeset	46	o 3: 'C'
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	o 2: 'B'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	49	\|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16913 diff changeset	50	@ 1: 'AD'
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	51	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	52	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	53
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	54
f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	55	$ cd ..
23406 65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	56
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	57
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	58	Test rebasing of merges with ancestors of the rebase destination - a situation
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	59	that often happens when trying to recover from repeated merging with a mainline
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	60	branch.
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	61
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	62	The test case creates a dev branch that contains a couple of merges from the
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	63	default branch. When rebasing to the default branch, these merges would be
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	64	merges with ancestors on the same branch. The merges _could_ contain some
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	65	interesting conflict resolutions or additional changes in the merge commit, but
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	66	that is mixed up with the actual merge stuff and there is in general no way to
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	67	separate them.
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	68
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	69	Note: The dev branch contains _no_ changes to f-default. It might be unclear
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	70	how rebasing of ancestor merges should be handled, but the current behavior
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	71	with spurious prompts for conflicts in files that didn't change seems very
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	72	wrong.
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	73
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	74	$ hg init ancestor-merge
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	75	$ cd ancestor-merge
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	76
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	77	$ touch f-default
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	78	$ hg ci -Aqm 'default: create f-default'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	79
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	80	$ hg branch -q dev
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	81	$ hg ci -qm 'dev: create branch'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	82
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	83	$ echo stuff > f-dev
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	84	$ hg ci -Aqm 'dev: f-dev stuff'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	85
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	86	$ hg up -q default
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	87	$ echo stuff > f-default
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	88	$ hg ci -m 'default: f-default stuff'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	89
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	90	$ hg up -q dev
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	91	$ hg merge -q default
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	92	$ hg ci -m 'dev: merge default'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	93
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	94	$ hg up -q default
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	95	$ hg rm f-default
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	96	$ hg ci -m 'default: remove f-default'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	97
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	98	$ hg up -q dev
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	99	$ hg merge -q default
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	100	$ hg ci -m 'dev: merge default'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	101
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	102	$ hg up -q default
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	103	$ echo stuff > f-other
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	104	$ hg ci -Aqm 'default: f-other stuff'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	105
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	106	$ hg tglog
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	107	@ 7: 'default: f-other stuff'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	108	\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	109	\| o 6: 'dev: merge default' dev
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	110	\|/\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	111	o \| 5: 'default: remove f-default'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	112	\| \|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	113	\| o 4: 'dev: merge default' dev
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	114	\|/\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	115	o \| 3: 'default: f-default stuff'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	116	\| \|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	117	\| o 2: 'dev: f-dev stuff' dev
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	118	\| \|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	119	\| o 1: 'dev: create branch' dev
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	120	\|/
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	121	o 0: 'default: create f-default'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	122
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	123	$ hg clone -qU . ../ancestor-merge-2
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	124
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	125	Full rebase all the way back from branching point:
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	126
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	127	$ hg rebase -r 'only(dev,default)' -d default
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	128	remote changed f-default which local deleted
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	129	use (c)hanged version or leave (d)eleted? c
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	130	local changed f-default which remote deleted
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	131	use (c)hanged version or (d)elete? c
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	132	saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-backup.hg (glob)
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	133	$ hg tglog
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	134	o 5: 'dev: merge default'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	135	\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	136	o 4: 'dev: f-dev stuff'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	137	\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	138	@ 3: 'default: f-other stuff'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	139	\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	140	o 2: 'default: remove f-default'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	141	\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	142	o 1: 'default: f-default stuff'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	143	\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	144	o 0: 'default: create f-default'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	145
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	146	Grafty cherry picking rebasing:
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	147
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	148	$ cd ../ancestor-merge-2
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	149
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	150	$ hg phase -fdr0:
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	151	$ hg rebase -r 'children(only(dev,default))' -d default
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	152	remote changed f-default which local deleted
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	153	use (c)hanged version or leave (d)eleted? c
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	154	local changed f-default which remote deleted
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	155	use (c)hanged version or (d)elete? c
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	156	saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-backup.hg (glob)
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	157	$ hg tglog
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	158	o 6: 'dev: merge default'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	159	\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	160	o 5: 'dev: f-dev stuff'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	161	\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	162	o 4: 'default: f-other stuff'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	163	\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	164	o 3: 'default: remove f-default'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	165	\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	166	o 2: 'default: f-default stuff'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	167	\|
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	168	\| o 1: 'dev: create branch' dev
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	169	\|/
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	170	o 0: 'default: create f-default'
65f215ea3e8e tests: add test for rebasing merges with ancestors of the rebase destination Mads Kiilerich <madski@unity3d.com> parents: 20117 diff changeset	171

author	Mads Kiilerich <madski@unity3d.com>
	Sun, 30 Nov 2014 19:35:54 +0100
changeset 23406	65f215ea3e8e
parent 20117	aa9385f983fa
child 23407	06b6867d853f
permissions	-rw-r--r--