evolve: tests/test-stabilize-order.t@ba95cec18fe9 (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.graphlog=
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	6	> EOF
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	7	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	8
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	9	$ glog() {
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	10	> 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	11	> }
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	$ hg init repo
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	14	$ cd repo
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	15	$ echo root > root
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	16	$ hg ci -Am addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	17	adding root
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	18	$ echo a > a
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	19	$ hg ci -Am adda
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	20	adding a
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	21	$ echo b > b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	22	$ hg ci -Am addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	23	adding b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	24	$ echo c > c
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	25	$ hg ci -Am addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	26	adding c
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	27	$ glog
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	28	@ 3:7a7552255fb5@default(draft) addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	29	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	30	o 2:ef23d6ef94d6@default(draft) addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	31	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	32	o 1:93418d2c0979@default(draft) adda
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	33	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	34	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	35
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	36	$ hg gdown
895 17ac69db9329 evolve: deprecate gup and gdown aliases Olle Lundberg <geek@nerd.sh> parents: 742 diff changeset	37	gdown have been deprecated in favor of previous
269 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
895 17ac69db9329 evolve: deprecate gup and gdown aliases Olle Lundberg <geek@nerd.sh> parents: 742 diff changeset	44	gdown have been deprecated in favor of previous
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	45	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	46	[1] adda
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	47	$ echo a >> a
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	48	$ hg amend
486 2111c655b4f5 fix typo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	49	1 new unstable changesets
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	50	$ glog
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	51	@ 7:005fe5914f78@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	52	\|
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	53	\| o 5:22619daeed78@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	54	\| \|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	55	\| \| o 3:7a7552255fb5@default(draft) addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	56	\| \| \|
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 302 diff changeset	57	\| \| x 2:ef23d6ef94d6@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	58	\| \|/
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 302 diff changeset	59	\| x 1:93418d2c0979@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	60	\|/
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	61	o 0:c471ef929e6a@default(draft) addroot
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
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	64	Test stabilizing a predecessor child
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	65
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	66	$ hg evolve -v
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	67	move:[5] addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	68	atop:[7] adda
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	69	hg rebase -r 22619daeed78 -d 005fe5914f78
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	70	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	71	getting b
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	72	committing files:
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	73	b
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	74	committing manifest
af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	75	committing changelog
1099 bac4e0bc9f6a evolve: write a status message when the working directory changes David Soria Parra <davidsp@fb.com> parents: 1067 diff changeset	76	working directory is now at bede829dd2d3
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	77	$ glog
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	78	@ 8:bede829dd2d3@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	79	\|
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	80	o 7:005fe5914f78@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	81	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	82	\| o 3:7a7552255fb5@default(draft) addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	83	\| \|
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 302 diff changeset	84	\| x 2:ef23d6ef94d6@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	85	\| \|
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 302 diff changeset	86	\| x 1:93418d2c0979@default(draft) adda
269 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	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	89
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	90
984 b286f77d680c tests: fix grammar, spelling, punctuation in comments Greg Ward <greg@gerg.ca> parents: 895 diff changeset	91	Test stabilizing a descendant predecessor's child
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	92
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	93	$ hg up 7
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	94	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	95	$ hg debugobsolete > successors.old
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	96	$ hg evolve -v
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	97	move:[3] addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	98	atop:[8] addb
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	99	hg rebase -r 7a7552255fb5 -d bede829dd2d3
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	100	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	101	getting b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	102	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	103	getting c
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	104	committing files:
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	105	c
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	106	committing manifest
af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	107	committing changelog
1099 bac4e0bc9f6a evolve: write a status message when the working directory changes David Soria Parra <davidsp@fb.com> parents: 1067 diff changeset	108	working directory is now at 65095d7d0dd5
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 346 diff changeset	109	$ hg debugobsolete > successors.new
281 258169d3428b test-stabilize-order.t: trace obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	110	$ diff -u successors.old successors.new
258169d3428b test-stabilize-order.t: trace obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	111	--- successors.old* (glob)
258169d3428b test-stabilize-order.t: trace obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	112	+++ successors.new* (glob)
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 346 diff changeset	113	@@ -3,3 +3,4 @@
1065 f355bbc124fc test: update test to new date formatting in debuobsolete output Pierre-Yves David <pierre-yves.david@fb.com> parents: 984 diff changeset	114	93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'user': 'test'} (glob)
1067 5d063fed9e3d evolve: yield to relevant markers handling in core Pierre-Yves David <pierre-yves.david@fb.com> parents: 1065 diff changeset	115	7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'user': 'test'} (glob)
1065 f355bbc124fc test: update test to new date formatting in debuobsolete output Pierre-Yves David <pierre-yves.david@fb.com> parents: 984 diff changeset	116	22619daeed78036f80fbd326b6852519c4f0c25e bede829dd2d3b2ae9bf198c23432b250dc964458 0 (*) {'user': 'test'} (glob)
f355bbc124fc test: update test to new date formatting in debuobsolete output Pierre-Yves David <pierre-yves.david@fb.com> parents: 984 diff changeset	117	+7a7552255fb5f8bd745e46fba6f0ca633a4dd716 65095d7d0dd5e4f15503bb7b1f433a5fe9bac052 0 (*) {'user': 'test'} (glob)
281 258169d3428b test-stabilize-order.t: trace obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	118	[1]
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	119
760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	120
760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	121
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	122	$ glog
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	123	@ 9:65095d7d0dd5@default(draft) addc
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	124	\|
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	125	o 8:bede829dd2d3@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	126	\|
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	127	o 7:005fe5914f78@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	128	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	129	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	130
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	131	$ hg evolve -v
713 e10fdb190aa1 evolve: update stabilize order test after output change Levi Bard <levi@unity3d.com> parents: 699 diff changeset	132	no troubled changesets
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	133	[1]
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	134
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	135	Test behaviour with --any
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	$ hg up 8
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	138	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	139	$ echo b >> b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	140	$ hg amend
486 2111c655b4f5 fix typo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	141	1 new unstable changesets
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	142	$ glog
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	143	@ 11:036cf654e942@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	144	\|
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	145	\| o 9:65095d7d0dd5@default(draft) addc
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	146	\| \|
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	147	\| x 8:bede829dd2d3@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	148	\|/
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	149	o 7:005fe5914f78@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	150	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	151	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	152
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	153	$ hg up 9
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	154	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	155	$ hg evolve -v
7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	156	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	157	(1 troubled changesets, do you want --any ?)
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	158	[2]
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	159	$ hg evolve --any -v
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	160	move:[9] addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	161	atop:[11] addb
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	162	hg rebase -r 65095d7d0dd5 -d 036cf654e942
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	163	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	164	removing c
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	165	getting b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	166	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	167	getting c
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	168	committing files:
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	169	c
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	170	committing manifest
af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	171	committing changelog
1099 bac4e0bc9f6a evolve: write a status message when the working directory changes David Soria Parra <davidsp@fb.com> parents: 1067 diff changeset	172	working directory is now at e99ecf51c867
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	173	$ glog
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	174	@ 12:e99ecf51c867@default(draft) addc
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	175	\|
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	176	o 11:036cf654e942@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	177	\|
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	178	o 7:005fe5914f78@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	179	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	180	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	181
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	182	$ hg evolve --any -v
713 e10fdb190aa1 evolve: update stabilize order test after output change Levi Bard <levi@unity3d.com> parents: 699 diff changeset	183	no troubled changesets
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	184	[1]

author	Pierre-Yves David <pierre-yves.david@fb.com>
	Fri, 19 Jun 2015 10:47:02 -0700
changeset 1396	ba95cec18fe9
parent 1195	af9fd422adbb
child 1404	848a04c078c7
permissions	-rw-r--r--