evolve: tests/test-stabilize-order.t@c39afce52e31 (annotated)

269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	1	$ cat >> $HGRCPATH <<EOF
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	2	> [defaults]
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	3	> amend=-d "0 0"
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	4	> [extensions]
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	5	> hgext.rebase=
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	6	> hgext.graphlog=
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	7	> EOF
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	8	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	9
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	10	$ glog() {
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	11	> hg glog --template '{rev}:{node\|short}@{branch}({phase}) {desc\|firstline}\n' "$@"
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	12	> }
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	13
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	14	$ hg init repo
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	15	$ cd repo
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	16	$ echo root > root
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	17	$ hg ci -Am addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	18	adding root
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	19	$ echo a > a
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	20	$ hg ci -Am adda
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	21	adding a
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	22	$ echo b > b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	23	$ hg ci -Am addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	24	adding b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	25	$ echo c > c
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	26	$ hg ci -Am addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	27	adding c
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	28	$ glog
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	29	@ 3:7a7552255fb5@default(draft) addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	30	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	31	o 2:ef23d6ef94d6@default(draft) addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	32	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	33	o 1:93418d2c0979@default(draft) adda
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	34	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	35	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	36
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	37	$ hg gdown
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	38	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	39	[2] addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	40	$ echo b >> b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	41	$ hg amend
486 2111c655b4f5 fix typo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	42	1 new unstable changesets
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	43	$ hg gdown
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	44	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	45	[1] adda
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	46	$ echo a >> a
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	47	$ hg amend
486 2111c655b4f5 fix typo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	48	1 new unstable changesets
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	49	$ glog
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	50	@ 7:f5ff10856e5a@default(draft) adda
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	51	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	52	\| o 5:ab8cbb6d87ff@default(draft) addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	53	\| \|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	54	\| \| o 3:7a7552255fb5@default(draft) addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	55	\| \| \|
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 302 diff changeset	56	\| \| x 2:ef23d6ef94d6@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	57	\| \|/
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 302 diff changeset	58	\| x 1:93418d2c0979@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	59	\|/
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	60	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	61
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	62
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	63	Test stabilizing a predecessor child
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	64
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	65	$ hg evolve -v
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	66	move:[5] addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	67	atop:[7] adda
546 415540dee2bd fix missing --dest evolve output in dryrun Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	68	hg rebase -r ab8cbb6d87ff -d f5ff10856e5a
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	69	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	70	getting b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	71	b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	72	$ glog
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	73	@ 8:6bf44048e43f@default(draft) addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	74	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	75	o 7:f5ff10856e5a@default(draft) adda
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	76	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	77	\| o 3:7a7552255fb5@default(draft) addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	78	\| \|
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 302 diff changeset	79	\| x 2:ef23d6ef94d6@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	80	\| \|
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 302 diff changeset	81	\| x 1:93418d2c0979@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	82	\|/
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	83	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	84
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	85
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	86	Test stabilizing a descendant predecessors child
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	87
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	88	$ hg up 7
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	89	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 346 diff changeset	90	$ hg debugobsolete > successors.old
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	91	$ hg evolve -v
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	92	move:[3] addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	93	atop:[8] addb
546 415540dee2bd fix missing --dest evolve output in dryrun Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	94	hg rebase -r 7a7552255fb5 -d 6bf44048e43f
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	95	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	96	getting b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	97	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	98	getting c
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	99	c
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 346 diff changeset	100	$ hg debugobsolete > successors.new
281 258169d3428b test-stabilize-order.t: trace obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	101	$ diff -u successors.old successors.new
258169d3428b test-stabilize-order.t: trace obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	102	--- successors.old* (glob)
258169d3428b test-stabilize-order.t: trace obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	103	+++ successors.new* (glob)
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 346 diff changeset	104	@@ -3,3 +3,4 @@
443 3f8c11865ed2 obsolete: remove usage of addcollapsedobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 441 diff changeset	105	3a4a591493f80708e46f2bf6d3b4debfad8ff91e f5ff10856e5ab3c8dc420b9c11460e6832a3b78c 0 {'date': '* *', 'user': 'test'} (glob)
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 346 diff changeset	106	93418d2c0979643ad446f621195e78720edb05b4 f5ff10856e5ab3c8dc420b9c11460e6832a3b78c 0 {'date': '* *', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 346 diff changeset	107	ab8cbb6d87ff3ab5526735a051cba6b63f3d6775 6bf44048e43f830accbf7d2bd7bc252ad7a3b99c 0 {'date': '* *', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 346 diff changeset	108	+7a7552255fb5f8bd745e46fba6f0ca633a4dd716 5e819fbb0d278117c0a83b7f6f6486689732cfb2 0 {'date': '* *', 'user': 'test'} (glob)
281 258169d3428b test-stabilize-order.t: trace obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	109	[1]
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	110	$ glog
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	111	@ 9:5e819fbb0d27@default(draft) addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	112	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	113	o 8:6bf44048e43f@default(draft) addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	114	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	115	o 7:f5ff10856e5a@default(draft) adda
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	116	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	117	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	118
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	119	$ hg evolve -v
468 6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	120	no troubled changeset
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	121	[1]
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	122
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	123	Test behaviour with --any
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	124
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	125	$ hg up 8
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	126	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	127	$ echo b >> b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	128	$ hg amend
486 2111c655b4f5 fix typo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	129	1 new unstable changesets
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	130	$ glog
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	131	@ 11:4e7cec6b4afe@default(draft) addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	132	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	133	\| o 9:5e819fbb0d27@default(draft) addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	134	\| \|
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 302 diff changeset	135	\| x 8:6bf44048e43f@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	136	\|/
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	137	o 7:f5ff10856e5a@default(draft) adda
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	138	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	139	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	140
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	141	$ hg up 9
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	142	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	143	$ hg evolve -v
7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	144	nothing to evolve here
468 6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	145	(1 troubled changesets, do you want --any ?)
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	146	[2]
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	147	$ hg evolve --any -v
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	148	move:[9] addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	149	atop:[11] addb
546 415540dee2bd fix missing --dest evolve output in dryrun Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	150	hg rebase -r 5e819fbb0d27 -d 4e7cec6b4afe
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	151	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	152	removing c
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	153	getting b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	154	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	155	getting c
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	156	c
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	157	$ glog
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	158	@ 12:24f95816bb21@default(draft) addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	159	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	160	o 11:4e7cec6b4afe@default(draft) addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	161	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	162	o 7:f5ff10856e5a@default(draft) adda
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	163	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	164	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	165
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	166	$ hg evolve --any -v
468 6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	167	no troubled changeset
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	168	[1]

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
	Wed, 21 Nov 2012 11:37:30 +0100
changeset 618	c39afce52e31
parent 546	415540dee2bd
child 699	dba3ed9f2c4f
permissions	-rw-r--r--