evolve: tests/test-obsolete.t@3d5bed04ee4c (annotated)

32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	1	$ cat >> $HGRCPATH <<EOF
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	2	> [web]
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	3	> push_ssl = false
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	4	> allow_push = *
112 eae9be0ee00e adapt obsolete to phase. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 98 diff changeset	5	> [phases]
eae9be0ee00e adapt obsolete to phase. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 98 diff changeset	6	> publish=False
143 0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	7	> [alias]
305 0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 299 diff changeset	8	> odiff=diff --rev 'limit(precursors(.),1)' --rev .
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	9	> [extensions]
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 486 diff changeset	10	> hgext.rebase=
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	11	> EOF
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 486 diff changeset	12	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	13	$ mkcommit() {
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	14	> echo "$1" > "$1"
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	15	> hg add "$1"
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	16	> hg ci -m "add $1"
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	17	> }
343 6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	18	$ getid() {
6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	19	> hg id --debug -ir "$1"
6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	20	> }
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	21
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	22	$ alias qlog="hg log --template='{rev}\n- {node\|short}\n'"
39 b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 32 diff changeset	23	$ hg init local
b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 32 diff changeset	24	$ cd local
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	25	$ mkcommit a # 0
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	26	$ hg phase -p .
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	27	$ mkcommit b # 1
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	28	$ mkcommit c # 2
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	29	$ hg up 1
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	30	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	31	$ mkcommit obsol_c # 3
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	32	created new head
343 6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	33	$ getid 2
6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	34	4538525df7e2b9f09423636c61ef63a4cb872a2d
6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	35	$ getid 3
6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	36	0d3f46688ccc6e756c7e96cf64c391c411309597
6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	37	$ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	38	$ hg debugobsolete
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 421 diff changeset	39	4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'} (glob)
343 6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	40
39 b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 32 diff changeset	41
398 42828b0ace98 obsolete: fix hidden() revset Patrick Mezard <patrick@mezard.eu> parents: 390 diff changeset	42	Test hidden() revset
42828b0ace98 obsolete: fix hidden() revset Patrick Mezard <patrick@mezard.eu> parents: 390 diff changeset	43
42828b0ace98 obsolete: fix hidden() revset Patrick Mezard <patrick@mezard.eu> parents: 390 diff changeset	44	$ qlog -r 'hidden()' --hidden
42828b0ace98 obsolete: fix hidden() revset Patrick Mezard <patrick@mezard.eu> parents: 390 diff changeset	45	2
42828b0ace98 obsolete: fix hidden() revset Patrick Mezard <patrick@mezard.eu> parents: 390 diff changeset	46	- 4538525df7e2
39 b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 32 diff changeset	47
b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 32 diff changeset	48	Test that obsolete changeset are hidden
b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 32 diff changeset	49
45 d89453a10991 include hash in test. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 44 diff changeset	50	$ qlog
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	51	3
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	52	- 0d3f46688ccc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	53	1
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	54	- 7c3bad9141dc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	55	0
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	56	- 1f0dee641bb7
45 d89453a10991 include hash in test. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 44 diff changeset	57	$ qlog --hidden
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	58	3
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	59	- 0d3f46688ccc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	60	2
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	61	- 4538525df7e2
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	62	1
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	63	- 7c3bad9141dc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	64	0
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	65	- 1f0dee641bb7
45 d89453a10991 include hash in test. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 44 diff changeset	66	$ qlog -r 'obsolete()' --hidden
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	67	2
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	68	- 4538525df7e2
39 b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 32 diff changeset	69
143 0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	70	Test that obsolete parent a properly computed
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	71
305 0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 299 diff changeset	72	$ qlog -r 'precursors(.)' --hidden
143 0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	73	2
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	74	- 4538525df7e2
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	75	$ qlog -r .
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	76	3
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	77	- 0d3f46688ccc
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	78	$ hg odiff
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	79	diff -r 4538525df7e2 -r 0d3f46688ccc c
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	80	--- a/c Thu Jan 01 00:00:00 1970 +0000
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	81	+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	82	@@ -1,1 +0,0 @@
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	83	-c
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	84	diff -r 4538525df7e2 -r 0d3f46688ccc obsol_c
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	85	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	86	+++ b/obsol_c Thu Jan 01 00:00:00 1970 +0000
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	87	@@ -0,0 +1,1 @@
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	88	+obsol_c
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 136 diff changeset	89
306 8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	90	Test that obsolete successors a properly computed
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	91
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	92	$ qlog -r 'successors(2)' --hidden
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	93	3
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	94	- 0d3f46688ccc
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	95
40 b9a5a596d9ef proper computation of hidden changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 39 diff changeset	96	test obsolete changeset with no-obsolete descendant
b9a5a596d9ef proper computation of hidden changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 39 diff changeset	97	$ hg up 1 -q
b9a5a596d9ef proper computation of hidden changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 39 diff changeset	98	$ mkcommit "obsol_c'" # 4 (on 1)
b9a5a596d9ef proper computation of hidden changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 39 diff changeset	99	created new head
343 6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	100	$ hg debugobsolete `getid 3` `getid 4`
45 d89453a10991 include hash in test. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 44 diff changeset	101	$ qlog
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	102	4
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	103	- 725c380fe99b
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	104	1
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	105	- 7c3bad9141dc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	106	0
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	107	- 1f0dee641bb7
45 d89453a10991 include hash in test. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 44 diff changeset	108	$ qlog -r 'obsolete()' --hidden
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	109	2
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	110	- 4538525df7e2
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	111	3
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	112	- 0d3f46688ccc
305 0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 299 diff changeset	113	$ qlog -r 'allprecursors(4)' --hidden
144 f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	114	2
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	115	- 4538525df7e2
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	116	3
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	117	- 0d3f46688ccc
306 8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	118	$ qlog -r 'allsuccessors(2)' --hidden
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	119	3
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	120	- 0d3f46688ccc
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	121	4
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	122	- 725c380fe99b
40 b9a5a596d9ef proper computation of hidden changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 39 diff changeset	123	$ hg up 3 -q
79 9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	124	Working directory parent is obsolete
40 b9a5a596d9ef proper computation of hidden changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 39 diff changeset	125	$ mkcommit d # 5 (on 3)
486 2111c655b4f5 fix typo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 480 diff changeset	126	1 new unstable changesets
45 d89453a10991 include hash in test. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 44 diff changeset	127	$ qlog -r 'obsolete()'
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	128	3
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	129	- 0d3f46688ccc
40 b9a5a596d9ef proper computation of hidden changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 39 diff changeset	130
136 915728be8afd add test for revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	131	$ qlog -r 'extinct()' --hidden
915728be8afd add test for revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	132	2
915728be8afd add test for revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	133	- 4538525df7e2
915728be8afd add test for revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	134	$ qlog -r 'suspended()'
915728be8afd add test for revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	135	3
915728be8afd add test for revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	136	- 0d3f46688ccc
915728be8afd add test for revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	137	$ qlog -r 'unstable()'
915728be8afd add test for revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	138	5
915728be8afd add test for revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	139	- a7a6f2b5d8a5
915728be8afd add test for revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	140
299 eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	141	Test obsolete keyword
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	142
570 1c45a07dda51 test-obsolete: clean up useless inlined option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 554 diff changeset	143	$ hg log -G --template '{rev}:{node\|short}@{branch}({obsolete}/{phase}) {desc\|firstline}\n' \
299 eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	144	> --hidden
385 cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	145	@ 5:a7a6f2b5d8a5@default(unstable/draft) add d
299 eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	146	\|
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	147	\| o 4:725c380fe99b@default(stable/draft) add obsol_c'
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	148	\| \|
385 cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	149	x \| 3:0d3f46688ccc@default(suspended/draft) add obsol_c
299 eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	150	\|/
385 cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	151	\| x 2:4538525df7e2@default(extinct/draft) add c
299 eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	152	\|/
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	153	o 1:7c3bad9141dc@default(stable/draft) add b
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	154	\|
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	155	o 0:1f0dee641bb7@default(stable/public) add a
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	156
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 280 diff changeset	157
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	158	Test communication of obsolete relation with a compatible client
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	159
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	160	$ hg init ../other-new
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	161	$ hg phase --draft 'secret() - extinct()' # until we fix exclusion
385 cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	162	abort: empty revision set
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	163	[255]
217 786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	164	$ hg push ../other-new
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	165	pushing to ../other-new
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	166	searching for changes
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 587 diff changeset	167	abort: push includes unstable changeset: a7a6f2b5d8a5!
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	168	(use 'hg evolve' to get a stable history or --force to ignore warnings)
217 786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	169	[255]
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	170	$ hg push -f ../other-new
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	171	pushing to ../other-new
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	172	searching for changes
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	173	adding changesets
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	174	adding manifests
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	175	adding file changes
46 3b0364fc822f Do not propagate obsolete changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 45 diff changeset	176	added 5 changesets with 5 changes to 5 files (+1 heads)
215 0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	177	$ hg -R ../other-new verify
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	178	checking changesets
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	179	checking manifests
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	180	crosschecking files in changesets and manifests
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	181	checking files
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	182	5 files, 5 changesets, 5 total revisions
45 d89453a10991 include hash in test. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 44 diff changeset	183	$ qlog -R ../other-new -r 'obsolete()'
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	184	2
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	185	- 0d3f46688ccc
45 d89453a10991 include hash in test. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 44 diff changeset	186	$ qlog -R ../other-new
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	187	4
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	188	- a7a6f2b5d8a5
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	189	3
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	190	- 725c380fe99b
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	191	2
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	192	- 0d3f46688ccc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	193	1
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	194	- 7c3bad9141dc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	195	0
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	196	- 1f0dee641bb7
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	197	$ hg up 3 -q
79 9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	198	Working directory parent is obsolete
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	199	$ mkcommit obsol_d # 6
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	200	created new head
486 2111c655b4f5 fix typo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 480 diff changeset	201	1 new unstable changesets
343 6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	202	$ hg debugobsolete `getid 5` `getid 6`
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	203	$ qlog
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	204	6
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	205	- 95de7fc6918d
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	206	4
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	207	- 725c380fe99b
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	208	3
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	209	- 0d3f46688ccc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	210	1
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	211	- 7c3bad9141dc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	212	0
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	213	- 1f0dee641bb7
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	214	$ qlog -r 'obsolete()'
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	215	3
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	216	- 0d3f46688ccc
217 786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	217	$ hg push ../other-new
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	218	pushing to ../other-new
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	219	searching for changes
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 587 diff changeset	220	abort: push includes unstable changeset: 95de7fc6918d!
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	221	(use 'hg evolve' to get a stable history or --force to ignore warnings)
217 786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	222	[255]
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	223	$ hg push ../other-new -f # use f because there is unstability
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	224	pushing to ../other-new
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	225	searching for changes
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	226	adding changesets
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	227	adding manifests
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	228	adding file changes
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	229	added 1 changesets with 1 changes to 1 files (+1 heads)
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	230	$ qlog -R ../other-new
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	231	5
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	232	- 95de7fc6918d
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	233	3
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	234	- 725c380fe99b
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	235	2
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	236	- 0d3f46688ccc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	237	1
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	238	- 7c3bad9141dc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	239	0
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	240	- 1f0dee641bb7
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	241	$ qlog -R ../other-new -r 'obsolete()'
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	242	2
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	243	- 0d3f46688ccc
214 a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 206 diff changeset	244
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 206 diff changeset	245	Pushing again does not advertise extinct changeset
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 206 diff changeset	246
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 206 diff changeset	247	$ hg push ../other-new
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 206 diff changeset	248	pushing to ../other-new
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 206 diff changeset	249	searching for changes
385 cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	250	no changes found
214 a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 206 diff changeset	251	[1]
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 206 diff changeset	252
79 9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	253	$ hg up -q .^ # 3
9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	254	Working directory parent is obsolete
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	255	$ mkcommit "obsol_d'" # 7
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	256	created new head
486 2111c655b4f5 fix typo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 480 diff changeset	257	1 new unstable changesets
343 6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	258	$ hg debugobsolete `getid 6` `getid 7`
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	259	$ hg pull -R ../other-new .
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	260	pulling from .
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	261	searching for changes
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	262	adding changesets
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	263	adding manifests
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	264	adding file changes
633 3d5bed04ee4c test: adapt to the way the bundle is generated Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 594 diff changeset	265	added 1 changesets with 1 changes to [12] files $\+1 heads$ (re)
3d5bed04ee4c test: adapt to the way the bundle is generated Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 594 diff changeset	266	$run 'hg heads( \.)?' to see heads, 'hg merge' to merge$ (re)
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	267	$ qlog -R ../other-new
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	268	6
49 4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	269	- 909a0fb57e5d
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	270	3
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	271	- 725c380fe99b
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	272	2
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	273	- 0d3f46688ccc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	274	1
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	275	- 7c3bad9141dc
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	276	0
4e804af47e57 Change test output again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	277	- 1f0dee641bb7
46 3b0364fc822f Do not propagate obsolete changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 45 diff changeset	278
3b0364fc822f Do not propagate obsolete changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 45 diff changeset	279	pushing to stuff that doesn't support obsolete
3b0364fc822f Do not propagate obsolete changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 45 diff changeset	280
405 b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	281	DISABLED. the _enable switch it global :-/
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	282
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	283	.. $ hg init ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	284	.. > # XXX I don't like this but changeset get published otherwise
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	285	.. > # remove it when we will get a --keep-state flag for push
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	286	.. $ echo '[extensions]' > ../other-old/.hg/hgrc
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	287	.. $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	288	.. $ hg push ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	289	.. pushing to ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	290	.. searching for changes
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	291	.. abort: push includes an unstable changeset: 909a0fb57e5d!
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	292	.. (use 'hg evolve' to get a stable history or --force to ignore warnings)
405 b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	293	.. [255]
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	294	.. $ hg push -f ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	295	.. pushing to ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	296	.. searching for changes
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	297	.. adding changesets
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	298	.. adding manifests
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	299	.. adding file changes
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	300	.. added 5 changesets with 5 changes to 5 files (+1 heads)
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	301	.. $ qlog -R ../other-ol
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	302	.. 4
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	303	.. - 909a0fb57e5d
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	304	.. 3
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	305	.. - 725c380fe99b
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	306	.. 2
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	307	.. - 0d3f46688ccc
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	308	.. 1
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	309	.. - 7c3bad9141dc
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	310	.. 0
b5b1bf5166a2 obsolete: enable obsolete feature Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 398 diff changeset	311	.. - 1f0dee641bb7
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	312
50 19b22ad56b32 clone support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 49 diff changeset	313	clone support
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	314
50 19b22ad56b32 clone support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 49 diff changeset	315	$ hg clone . ../cloned
75 d7b11772f0b5 [obsolete] published changeset can't be obsoleted Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 52 diff changeset	316	> # The warning should go away once we have default value to set ready before we pull
50 19b22ad56b32 clone support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 49 diff changeset	317	updating to branch default
19b22ad56b32 clone support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 49 diff changeset	318	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 40 diff changeset	319
389 cb575242d2ba test-obsolete: handle local clones copying obsolete markers Patrick Mezard <patrick@mezard.eu> parents: 385 diff changeset	320	$ qlog -R ../cloned --hidden
385 cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	321	7
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	322	- 909a0fb57e5d
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	323	6
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	324	- 95de7fc6918d
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	325	5
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	326	- a7a6f2b5d8a5
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	327	4
385 cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	328	- 725c380fe99b
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	329	3
385 cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	330	- 0d3f46688ccc
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	331	2
385 cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 381 diff changeset	332	- 4538525df7e2
50 19b22ad56b32 clone support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 49 diff changeset	333	1
19b22ad56b32 clone support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 49 diff changeset	334	- 7c3bad9141dc
19b22ad56b32 clone support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 49 diff changeset	335	0
19b22ad56b32 clone support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 49 diff changeset	336	- 1f0dee641bb7
19b22ad56b32 clone support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 49 diff changeset	337
52 62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	338	Test rollback support
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	339
79 9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	340	$ hg up .^ -q # 3
9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	341	Working directory parent is obsolete
52 62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	342	$ mkcommit "obsol_d''"
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	343	created new head
486 2111c655b4f5 fix typo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 480 diff changeset	344	1 new unstable changesets
343 6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	345	$ hg debugobsolete `getid 7` `getid 8`
215 0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	346	$ cd ../other-new
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	347	$ hg up -q 3
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	348	$ hg pull ../local/
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	349	pulling from ../local/
52 62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	350	searching for changes
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	351	adding changesets
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	352	adding manifests
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	353	adding file changes
633 3d5bed04ee4c test: adapt to the way the bundle is generated Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 594 diff changeset	354	added 1 changesets with 1 changes to [12] files $\+1 heads$ (re)
3d5bed04ee4c test: adapt to the way the bundle is generated Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 594 diff changeset	355	$run 'hg heads( \.)?' to see heads, 'hg merge' to merge$ (re)
52 62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	356
215 0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	357	$ hg up -q 7 # to check rollback update behavior
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	358	$ qlog
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	359	7
52 62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	360	- 159dfc9fa5d3
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	361	3
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	362	- 725c380fe99b
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	363	2
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	364	- 0d3f46688ccc
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	365	1
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	366	- 7c3bad9141dc
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	367	0
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	368	- 1f0dee641bb7
215 0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	369	$ hg rollback
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	370	repository tip rolled back to revision 6 (undo pull)
215 0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	371	working directory now based on revision 3
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	372	$ hg summary
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	373	parent: 3:725c380fe99b
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	374	add obsol_c'
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	375	branch: default
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	376	commit: 1 deleted, 2 unknown (clean)
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	377	update: 4 new changesets, 4 branch heads (merge)
479 b63da0fb8ee5 obsolete: add obsolete data to summary. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 473 diff changeset	378	unstable: 1 changesets
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 572 diff changeset	379	divergent: 1 changesets
215 0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	380	$ qlog
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	381	6
52 62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	382	- 909a0fb57e5d
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	383	3
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	384	- 725c380fe99b
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	385	2
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	386	- 0d3f46688ccc
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	387	1
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	388	- 7c3bad9141dc
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	389	0
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	390	- 1f0dee641bb7
215 0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	391	$ cd ../local
52 62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	392
112 eae9be0ee00e adapt obsolete to phase. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 98 diff changeset	393	obsolete public changeset
eae9be0ee00e adapt obsolete to phase. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 98 diff changeset	394
eae9be0ee00e adapt obsolete to phase. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 98 diff changeset	395	# move draft boundary from 0 to 1
eae9be0ee00e adapt obsolete to phase. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 98 diff changeset	396	$ sed -e 's/1f0dee641bb7258c56bd60e93edfa2405381c41e/7c3bad9141dcb46ff89abf5f61856facd56e476c/' -i'.back' .hg/store/phaseroots
75 d7b11772f0b5 [obsolete] published changeset can't be obsoleted Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 52 diff changeset	397
d7b11772f0b5 [obsolete] published changeset can't be obsoleted Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 52 diff changeset	398	$ hg up null
d7b11772f0b5 [obsolete] published changeset can't be obsoleted Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 52 diff changeset	399	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
80 5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	400	$ mkcommit toto # 9
75 d7b11772f0b5 [obsolete] published changeset can't be obsoleted Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 52 diff changeset	401	created new head
80 5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	402	$ hg id -n
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	403	9
343 6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	404	$ hg debugobsolete `getid 0` `getid 9`
6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	405	83b5778897ad try to obsolete immutable changeset 1f0dee641bb7
6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	406	# at core level the warning is not issued
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 587 diff changeset	407	# this is now a big issue now that we have bumped warning
75 d7b11772f0b5 [obsolete] published changeset can't be obsoleted Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 52 diff changeset	408	$ qlog -r 'obsolete()'
d7b11772f0b5 [obsolete] published changeset can't be obsoleted Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 52 diff changeset	409	3
d7b11772f0b5 [obsolete] published changeset can't be obsoleted Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 52 diff changeset	410	- 0d3f46688ccc
80 5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	411	allow to just kill changeset
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	412
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	413	$ qlog
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	414	9
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	415	- 83b5778897ad
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	416	8
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	417	- 159dfc9fa5d3
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	418	4
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	419	- 725c380fe99b
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	420	3
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	421	- 0d3f46688ccc
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	422	1
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	423	- 7c3bad9141dc
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	424	0
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	425	- 1f0dee641bb7
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	426
343 6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	427	$ hg debugobsolete `getid 9` #kill
80 5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	428	$ hg up null -q # to be not based on 9 anymore
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	429	$ qlog
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	430	8
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	431	- 159dfc9fa5d3
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	432	4
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	433	- 725c380fe99b
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	434	3
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	435	- 0d3f46688ccc
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	436	1
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	437	- 7c3bad9141dc
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	438	0
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	439	- 1f0dee641bb7
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	440
473 1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 471 diff changeset	441	Check that auto update ignore hidden changeset
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 471 diff changeset	442	$ hg up 0
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 471 diff changeset	443	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 471 diff changeset	444	$ hg up
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 471 diff changeset	445	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 471 diff changeset	446	$ hg id -n
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 471 diff changeset	447	8
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 471 diff changeset	448
480 cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 479 diff changeset	449	Check that named update do too
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 479 diff changeset	450
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 479 diff changeset	451	$ hg update default
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 479 diff changeset	452	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 479 diff changeset	453	$ hg id -n
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 479 diff changeset	454	8
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 479 diff changeset	455
473 1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 471 diff changeset	456	$ hg up null -q # to be not based on 9 anymore
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 471 diff changeset	457
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	458	check rebase compat
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	459
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	460	$ hg log -G --template='{rev} - {node\|short} {desc}\n'
dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	461	o 8 - 159dfc9fa5d3 add obsol_d''
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	462	\|
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	463	\| o 4 - 725c380fe99b add obsol_c'
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	464	\| \|
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	465	x \| 3 - 0d3f46688ccc add obsol_c
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	466	\|/
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	467	o 1 - 7c3bad9141dc add b
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	468	\|
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	469	o 0 - 1f0dee641bb7 add a
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	470
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	471
570 1c45a07dda51 test-obsolete: clean up useless inlined option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 554 diff changeset	472	$ hg log -G --template='{rev} - {node\|short}\n' --hidden
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 343 diff changeset	473	x 9 - 83b5778897ad
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	474
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	475	o 8 - 159dfc9fa5d3
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	476	\|
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 343 diff changeset	477	\| x 7 - 909a0fb57e5d
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	478	\|/
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 343 diff changeset	479	\| x 6 - 95de7fc6918d
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	480	\|/
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 343 diff changeset	481	\| x 5 - a7a6f2b5d8a5
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	482	\|/
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	483	\| o 4 - 725c380fe99b
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	484	\| \|
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 343 diff changeset	485	x \| 3 - 0d3f46688ccc
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	486	\|/
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 343 diff changeset	487	\| x 2 - 4538525df7e2
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	488	\|/
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	489	o 1 - 7c3bad9141dc
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	490	\|
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	491	o 0 - 1f0dee641bb7
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	492
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	493
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	494	should not rebase extinct changeset
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	495
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	496	#excluded 'whole rebase set is extinct and ignored.' message not in core
dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	497	$ hg rebase -s 7 -d 4 2>&1 \| grep -v 'whole rebase'
471 8be3973adf34 obsolete: warn when the whole rebase set was remove because extinct Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 455 diff changeset	498	nothing to rebase
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	499	$ hg rebase -b '3' -d 4 --traceback
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 572 diff changeset	500	2 new divergent changesets
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	501	$ hg log -G --template='{rev} - {node\|short} {desc}\n'
dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	502	@ 11 - 9468a5f5d8b2 add obsol_d''
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	503	\|
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	504	o 10 - 2033b4e49474 add obsol_c
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	505	\|
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	506	o 4 - 725c380fe99b add obsol_c'
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	507	\|
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	508	o 1 - 7c3bad9141dc add b
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	509	\|
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	510	o 0 - 1f0dee641bb7 add a
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	511
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	512
218 ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	513	Does not complain about new head if you obsolete the old one
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	514
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	515	$ hg push ../other-new --traceback
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	516	pushing to ../other-new
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	517	searching for changes
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	518	adding changesets
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	519	adding manifests
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	520	adding file changes
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	521	added 2 changesets with 1 changes to 1 files
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	522	$ hg up -q 10
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	523	$ mkcommit "obsol_d'''"
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	524	created new head
343 6b92f8d5ae58 adapt for new mercurial Pierre-Yves.David@ens-lyon.org parents: 320 diff changeset	525	$ hg debugobsolete `getid 11` `getid 12`
218 ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	526	$ hg push ../other-new --traceback
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	527	pushing to ../other-new
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	528	searching for changes
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	529	adding changesets
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	530	adding manifests
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	531	adding file changes
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	532	added 1 changesets with 1 changes to 1 files (+1 heads)
274 6622a24f3b0f obsolete: fix rebase wrapping Patrick Mezard <patrick@mezard.eu> parents: 225 diff changeset	533	$ cd ..
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	534
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 587 diff changeset	535	check bumped detection
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	536	(make an obsolete changeset public)
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	537
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	538	$ cd local
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	539	$ hg phase --public 11
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 587 diff changeset	540	1 new bumped changesets
570 1c45a07dda51 test-obsolete: clean up useless inlined option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 554 diff changeset	541	$ hg log -G --template='{rev} - ({phase}) {node\|short} {desc}\n'
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	542	@ 12 - (draft) 6db5e282cb91 add obsol_d'''
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	543	\|
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	544	\| o 11 - (public) 9468a5f5d8b2 add obsol_d''
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	545	\|/
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	546	o 10 - (public) 2033b4e49474 add obsol_c
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	547	\|
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	548	o 4 - (public) 725c380fe99b add obsol_c'
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	549	\|
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	550	o 1 - (public) 7c3bad9141dc add b
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	551	\|
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	552	o 0 - (public) 1f0dee641bb7 add a
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	553
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 587 diff changeset	554	$ hg log -r 'bumped()'
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	555	changeset: 12:6db5e282cb91
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	556	tag: tip
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	557	parent: 10:2033b4e49474
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	558	user: test
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	559	date: Thu Jan 01 00:00:00 1970 +0000
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	560	summary: add obsol_d'''
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	561
308 23ef1c71d164 obsolete: detect late comer during push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 307 diff changeset	562	$ hg push ../other-new/
23ef1c71d164 obsolete: detect late comer during push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 307 diff changeset	563	pushing to ../other-new/
23ef1c71d164 obsolete: detect late comer during push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 307 diff changeset	564	searching for changes
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 587 diff changeset	565	abort: push includes bumped changeset: 6db5e282cb91!
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	566	(use 'hg evolve' to get a stable history or --force to ignore warnings)
308 23ef1c71d164 obsolete: detect late comer during push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 307 diff changeset	567	[255]
320 63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	568
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	569	Check hg commit --amend compat
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	570
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	571	$ hg up 'desc(obsol_c)'
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	572	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	573	$ mkcommit f
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	574	created new head
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	575	$ echo 42 >> f
554 39eb12bb47c0 commit --amend: adap to core 63e45aee46d4 Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	576	$ hg commit --amend --traceback --quiet
570 1c45a07dda51 test-obsolete: clean up useless inlined option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 554 diff changeset	577	$ hg log -G
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 587 diff changeset	578	@ changeset: 15:705ab2a6b72e
320 63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	579	\| tag: tip
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	580	\| parent: 10:2033b4e49474
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	581	\| user: test
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	582	\| date: Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	583	\| summary: add f
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	584	\|
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	585	\| o changeset: 12:6db5e282cb91
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	586	\|/ parent: 10:2033b4e49474
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	587	\| user: test
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	588	\| date: Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	589	\| summary: add obsol_d'''
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	590	\|
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	591	\| o changeset: 11:9468a5f5d8b2
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	592	\|/ user: test
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	593	\| date: Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	594	\| summary: add obsol_d''
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	595	\|
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	596	o changeset: 10:2033b4e49474
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	597	\| parent: 4:725c380fe99b
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	598	\| user: test
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	599	\| date: Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	600	\| summary: add obsol_c
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	601	\|
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	602	o changeset: 4:725c380fe99b
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	603	\| parent: 1:7c3bad9141dc
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	604	\| user: test
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	605	\| date: Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	606	\| summary: add obsol_c'
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	607	\|
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	608	o changeset: 1:7c3bad9141dc
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	609	\| user: test
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	610	\| date: Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	611	\| summary: add b
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	612	\|
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	613	o changeset: 0:1f0dee641bb7
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	614	user: test
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	615	date: Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	616	summary: add a
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 308 diff changeset	617
554 39eb12bb47c0 commit --amend: adap to core 63e45aee46d4 Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	618	$ hg debugobsolete \| grep -v 33d458d86621f3186c40bfccd77652f4a122743e
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 421 diff changeset	619	4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 421 diff changeset	620	0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 {'date': '', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 421 diff changeset	621	a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 {'date': '', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 421 diff changeset	622	95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 {'date': '', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 421 diff changeset	623	909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 {'date': '', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 421 diff changeset	624	1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 421 diff changeset	625	83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob)
455 f46a41006136 obsolete: simplify rebase wrapping code and change relation creation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 441 diff changeset	626	0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 {'date': '* *', 'user': 'test'} (glob)
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 421 diff changeset	627	159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 {'date': '* *', 'user': 'test'} (glob)
d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 421 diff changeset	628	9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 {'date': '', 'user': 'test'} (glob)
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 587 diff changeset	629	0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 {'date': '* *', 'user': 'test'} (glob)
554 39eb12bb47c0 commit --amend: adap to core 63e45aee46d4 Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	630	#no produced by 2.3
39eb12bb47c0 commit --amend: adap to core 63e45aee46d4 Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	631	33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
354 bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	632
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	633	Check conflict detection
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	634
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	635	$ hg up 9468a5f5d8b2 # add obsol_d''
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	636	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	637	$ mkcommit "obsolet_conflicting_d"
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	638	$ hg summary
554 39eb12bb47c0 commit --amend: adap to core 63e45aee46d4 Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	639	parent: 1[46]:50f11e5e3a63 tip (re)
354 bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	640	add obsolet_conflicting_d
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	641	branch: default
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	642	commit: (clean)
554 39eb12bb47c0 commit --amend: adap to core 63e45aee46d4 Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	643	update: (9\|11) new changesets, (9\|10) branch heads $merge$ (re)
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 587 diff changeset	644	bumped: 1 changesets
359 43f79983f638 merge with conflicting detection Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 346 356 diff changeset	645	$ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
354 bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	646	$ hg log -r 'conflicting()'
587 8152fedbac65 evolve: smarter code for divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 586 diff changeset	647	changeset: 12:6db5e282cb91
8152fedbac65 evolve: smarter code for divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 586 diff changeset	648	parent: 10:2033b4e49474
8152fedbac65 evolve: smarter code for divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 586 diff changeset	649	user: test
8152fedbac65 evolve: smarter code for divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 586 diff changeset	650	date: Thu Jan 01 00:00:00 1970 +0000
8152fedbac65 evolve: smarter code for divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 586 diff changeset	651	summary: add obsol_d'''
8152fedbac65 evolve: smarter code for divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 586 diff changeset	652
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 587 diff changeset	653	changeset: 16:50f11e5e3a63
354 bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	654	tag: tip
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	655	parent: 11:9468a5f5d8b2
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	656	user: test
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	657	date: Thu Jan 01 00:00:00 1970 +0000
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	658	summary: add obsolet_conflicting_d
bd26eb9714fb obsolete: Detect conflicting changeset! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	659

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
	Tue, 18 Dec 2012 17:31:23 +0100
changeset 633	3d5bed04ee4c
parent 594	7f89b31fcb26
child 645	ca5459892427
permissions	-rw-r--r--