evolve: tests/test-stabilize-order.t@e5ba6531503e (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	> EOF
1806 9f42f819267b evolve: move the extensions to 'hgext3rd' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1780 diff changeset	6	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	7
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	8	$ glog() {
2776 4dd84054ebbb test: remove reference to the graphlog extension Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2709 diff changeset	9	> hg log -G --template '{rev}:{node\|short}@{branch}({phase}) {desc\|firstline}\n' "$@"
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	10	> }
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	$ hg init repo
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	13	$ cd repo
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	14	$ echo root > root
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	15	$ hg ci -Am addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	16	adding root
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	17	$ echo a > a
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	18	$ hg ci -Am adda
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	19	adding a
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	20	$ echo b > b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	21	$ hg ci -Am addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	22	adding b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	23	$ echo c > c
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	24	$ hg ci -Am addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	25	adding c
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	26	$ glog
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	27	@ 3:7a7552255fb5@default(draft) addc
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	28	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	29	o 2:ef23d6ef94d6@default(draft) addb
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 1:93418d2c0979@default(draft) adda
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 0:c471ef929e6a@default(draft) addroot
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	$ hg gdown
895 17ac69db9329 evolve: deprecate gup and gdown aliases Olle Lundberg <geek@nerd.sh> parents: 742 diff changeset	36	gdown have been deprecated in favor of previous
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	37	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	38	[2] addb
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	39	$ echo b >> b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	40	$ hg amend
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3105 diff changeset	41	1 new unstable changesets
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	42	$ hg gdown
895 17ac69db9329 evolve: deprecate gup and gdown aliases Olle Lundberg <geek@nerd.sh> parents: 742 diff changeset	43	gdown have been deprecated in favor of previous
269 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
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3105 diff changeset	48	1 new unstable changesets
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	49	$ glog
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	50	@ 7:005fe5914f78@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	51	\|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	52	\| o 5:22619daeed78@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	53	\| \|
3590 d5adce52cef4 test-compat: merge stable into mercurial-4.4 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3562 diff changeset	54	\| \| o 3:7a7552255fb5@default(draft) addc
269 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
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	66	move:[5] addb
f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	67	atop:[7] adda
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	68	hg rebase -r 22619daeed78 -d 005fe5914f78
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
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	71	committing files:
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	72	b
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	73	committing manifest
af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	74	committing changelog
1510 b86eea66ed02 evolve: be more complete about copying extra from old revisions Augie Fackler <raf@durin42.com> parents: 1420 diff changeset	75	working directory is now at 81b8bbcd5892
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	76	$ glog
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	77	@ 8:81b8bbcd5892@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	78	\|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	79	o 7:005fe5914f78@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	80	\|
3590 d5adce52cef4 test-compat: merge stable into mercurial-4.4 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3562 diff changeset	81	\| o 3:7a7552255fb5@default(draft) addc
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	82	\| \|
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 302 diff changeset	83	\| x 2:ef23d6ef94d6@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	84	\| \|
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 302 diff changeset	85	\| x 1:93418d2c0979@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	86	\|/
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	87	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	88
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	89
984 b286f77d680c tests: fix grammar, spelling, punctuation in comments Greg Ward <greg@gerg.ca> parents: 895 diff changeset	90	Test stabilizing a descendant predecessor's child
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	91
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	92	$ hg up 7
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	93	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	94	$ hg debugobsolete > successors.old
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	95	$ hg evolve -v
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	96	move:[3] addc
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	97	atop:[8] addb
1510 b86eea66ed02 evolve: be more complete about copying extra from old revisions Augie Fackler <raf@durin42.com> parents: 1420 diff changeset	98	hg rebase -r 7a7552255fb5 -d 81b8bbcd5892
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	99	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	100	getting b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	101	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	102	getting c
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	103	committing files:
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	104	c
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	105	committing manifest
af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	106	committing changelog
1510 b86eea66ed02 evolve: be more complete about copying extra from old revisions Augie Fackler <raf@durin42.com> parents: 1420 diff changeset	107	working directory is now at 0f691739f917
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 346 diff changeset	108	$ hg debugobsolete > successors.new
281 258169d3428b test-stabilize-order.t: trace obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	109	$ diff -u successors.old successors.new
258169d3428b test-stabilize-order.t: trace obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	110	--- successors.old* (glob)
258169d3428b test-stabilize-order.t: trace obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	111	+++ successors.new* (glob)
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	112	@@ -3,3 +3,4 @@
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3105 diff changeset	113	93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 () {'ef1': '', 'user': 'test'} (glob)
a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3105 diff changeset	114	7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} () {'ef1': '', 'user': 'test'} (glob)
3716 e5ba6531503e testcompat: update output for Mercurial 4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3715 diff changeset	115	22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
e5ba6531503e testcompat: update output for Mercurial 4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3715 diff changeset	116	+7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
281 258169d3428b test-stabilize-order.t: trace obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	117	[1]
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 713 diff changeset	118
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
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	121	$ glog
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	122	@ 9:0f691739f917@default(draft) addc
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	123	\|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	124	o 8:81b8bbcd5892@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	125	\|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	126	o 7:005fe5914f78@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	127	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	128	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	129
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	130	$ hg evolve -v
713 e10fdb190aa1 evolve: update stabilize order test after output change Levi Bard <levi@unity3d.com> parents: 699 diff changeset	131	no troubled changesets
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	132
1671 740d755a432d Spelling (en-us): behavior timeless@gmail.com parents: 1510 diff changeset	133	Test behavior with --any
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	134
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	135	$ hg up 8
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	136	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	137	$ echo b >> b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	138	$ hg amend
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3105 diff changeset	139	1 new unstable changesets
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	140	$ glog
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	141	@ 11:7a68bc4596ea@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	142	\|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	143	\| o 9:0f691739f917@default(draft) addc
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	144	\| \|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	145	\| x 8:81b8bbcd5892@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	146	\|/
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	147	o 7:005fe5914f78@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	148	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	149	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	150
3591 98941c28f3e2 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3590 3418 diff changeset	151	\| \|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	152	$ hg up 9
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	153	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	154	$ hg evolve -v
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1404 diff changeset	155	nothing to evolve on current working copy parent
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2833 diff changeset	156	(1 other orphan in the repository, do you want --any or --rev)
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	157	[2]
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	158	$ hg evolve --any -v
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	159	move:[9] addc
f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	160	atop:[11] addb
1510 b86eea66ed02 evolve: be more complete about copying extra from old revisions Augie Fackler <raf@durin42.com> parents: 1420 diff changeset	161	hg rebase -r 0f691739f917 -d 7a68bc4596ea
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	162	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	163	removing c
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	164	getting b
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	165	resolving manifests
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	166	getting c
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	167	committing files:
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	168	c
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	169	committing manifest
af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	170	committing changelog
1510 b86eea66ed02 evolve: be more complete about copying extra from old revisions Augie Fackler <raf@durin42.com> parents: 1420 diff changeset	171	working directory is now at 2256dae6521f
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	172	$ glog
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	173	@ 12:2256dae6521f@default(draft) addc
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	174	\|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	175	o 11:7a68bc4596ea@default(draft) addb
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	176	\|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	177	o 7:005fe5914f78@default(draft) adda
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	178	\|
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	179	o 0:c471ef929e6a@default(draft) addroot
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: diff changeset	180
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	181	$ hg evolve --any -v
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2833 diff changeset	182	no orphan changesets to evolve
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1404 diff changeset	183	[1]
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	184
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	185	Ambiguous evolution
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	186	$ echo a > k
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	187	$ hg add k
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	188	$ hg ci -m firstambiguous
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	189	$ hg up .^
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	190	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	191	$ echo a > l
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	192	$ hg add l
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	193	$ hg ci -m secondambiguous
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	194	created new head
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	195	$ hg up .^
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	196	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	197	$ hg commit --amend -m "newmessage"
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3105 diff changeset	198	2 new unstable changesets
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	199	$ hg log -G
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	200	@ changeset: 15:f83a0bce03e4
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	201	\| tag: tip
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	202	\| parent: 11:7a68bc4596ea
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	203	\| user: test
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	204	\| date: Thu Jan 01 00:00:00 1970 +0000
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	205	\| summary: newmessage
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	206	\|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	207	\| o changeset: 14:fa68011f392e
f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	208	\| \| parent: 12:2256dae6521f
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	209	\| \| user: test
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	210	\| \| date: Thu Jan 01 00:00:00 1970 +0000
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3105 diff changeset	211	\| \| trouble: unstable
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	212	\| \| summary: secondambiguous
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	213	\| \|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	214	\| \| o changeset: 13:bdc003b6eec2
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	215	\| \|/ user: test
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	216	\| \| date: Thu Jan 01 00:00:00 1970 +0000
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3105 diff changeset	217	\| \| trouble: unstable
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	218	\| \| summary: firstambiguous
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	219	\| \|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	220	\| x changeset: 12:2256dae6521f
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	221	\|/ user: test
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	222	\| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	223	\| obsolete: reworded as f83a0bce03e4
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	224	\| summary: addc
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	225	\|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	226	o changeset: 11:7a68bc4596ea
f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	227	\| parent: 7:005fe5914f78
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	228	\| user: test
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	229	\| date: Thu Jan 01 00:00:00 1970 +0000
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	230	\| summary: addb
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	231	\|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3103 diff changeset	232	o changeset: 7:005fe5914f78
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	233	\| parent: 0:c471ef929e6a
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	234	\| user: test
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	235	\| date: Thu Jan 01 00:00:00 1970 +0000
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	236	\| summary: adda
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	237	\|
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	238	o changeset: 0:c471ef929e6a
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	239	user: test
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	240	date: Thu Jan 01 00:00:00 1970 +0000
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	241	summary: addroot
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	242
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	243	$ hg evolve
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	244	abort: multiple evolve candidates
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	245	(select one of , with --rev) (glob)
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	246	[255]
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	247
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	248
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	249

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Wed, 25 Apr 2018 01:58:45 +0100
branch	mercurial-4.3
changeset 3716	e5ba6531503e
parent 3715	a77fb9669e99
permissions	-rw-r--r--