evolve: tests/test-state-strip.t@5111329280f1 (annotated)

99 67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	1
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	2
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	3	$ cat >> $HGRCPATH <<EOF
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	4	> [web]
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	5	> push_ssl = false
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	6	> allow_push = *
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	7	> [extensions]
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	8	> hgext.mq=
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	9	> hgext.graphlog=
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	10	> EOF
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	11	$ echo "states=$(echo $(dirname $TESTDIR))/hgext/states.py" >> $HGRCPATH
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	12
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	13	$ mkcommit() {
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	14	> echo "$1" > "$1"
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	15	> hg add "$1"
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	16	> hg ci -m "$1"
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	17	> }
101 21dbec91e775 fix strip - seems good enougth now Alain Leufroy <alain.leufroy@logilab.fr> parents: 100 diff changeset	18	$ alias hglog='hg glog --template "{desc} {state} {node}\n"'
99 67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	19
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	20	$ hg init alpha
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	21	$ cd alpha
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	22	$ hg states draft ready
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	23	$ mkcommit 0
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	24	$ mkcommit 1
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	25	$ hg up 0
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	26	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	27	$ mkcommit 2
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	28	created new head
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	29	$ mkcommit 3
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	30	$ mkcommit 4
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	31	$ hg up 3
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	32	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	33	$ mkcommit 5
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	34	created new head
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	35	$ hg up 1
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	36	1 files updated, 0 files merged, 3 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	37	$ mkcommit 6
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	38	$ hg published 6
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	39	$ hg ready 4
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	40	$ hglog
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	41	@ 6 published 2a653cad66937648173a936140f09a0e780afd76
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	42	\|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	43	\| o 5 draft ffe7eb8acef3efeceaa566b85a1ac419b0ecb856
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	44	\| \|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	45	\| \| o 4 ready 138777f75ddeb6ee0b527cfdb0eebbd1e0037bf6
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	46	\| \|/
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	47	\| o 3 ready 0915e256b0ca7f81dace67bc6fd512bfd1bcab85
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	48	\| \|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	49	\| o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	50	\| \|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	51	o \| 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	52	\|/
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	53	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	54
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	55
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	56	We strip a published heads, so published heads 6 -> 1
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	57	$ hg strip -n 6
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	58	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	59	$ hglog
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	60	o 5 draft ffe7eb8acef3efeceaa566b85a1ac419b0ecb856
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	61	\|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	62	\| o 4 ready 138777f75ddeb6ee0b527cfdb0eebbd1e0037bf6
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	63	\|/
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	64	o 3 ready 0915e256b0ca7f81dace67bc6fd512bfd1bcab85
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	65	\|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	66	o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	67	\|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	68	\| @ 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	69	\|/
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	70	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	71
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	72
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	73	Back to the previous configuration.
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	74	Then strip accros branches and remove draft changesets completly, and cut in
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	75	the middle of ready changesets
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	76	$ hg up 1
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	77	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	78	$ mkcommit 6
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	79	$ hg strip -n 3:6
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	80	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	81	$ hglog
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	82	o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	83	\|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	84	\| @ 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	85	\|/
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	86	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	87
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	88	Now merge 1 & 2 then strip merging changeset
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	89	$ hg up 1
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	90	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	91	$ hg merge 2
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	92	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	93	(branch merge, don't forget to commit)
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	94	$ hg commit -m Merge
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	95	$ hg strip -n 3
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	96	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	97	$ hglog
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	98	o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	99	\|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	100	\| @ 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	101	\|/
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	102	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	103
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	104	Do the same but with merge changeset as ready
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	105	$ hg up 1
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	106	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	107	$ hg merge 2
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	108	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	109	(branch merge, don't forget to commit)
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	110	$ hg commit -m Merge
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	111	$ hg ready 3
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	112	$ hg strip -n 3
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	113	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	114	$ hglog
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	115	o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	116	\|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	117	\| @ 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	118	\|/
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	119	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	120
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	121	$ hg log --template "{rev} {node}\n" -r 'readyheads()'
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	122	2 a00ba83de58390cbbdae1fc580df0bb0db2e8e88
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	123
100 7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	124	More complecated case: a merging changeset inheritate a ready state of one of
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	125	its child and have another child in draft. And We strip the ready child
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	126	$ hg up 1
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	127	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	128	$ hg merge 2
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	129	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	130	(branch merge, don't forget to commit)
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	131	$ hg ci -m 3
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	132	$ mkcommit 4
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	133	$ hg up 3
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	134	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	135	$ mkcommit 5
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	136	created new head
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	137	$ mkcommit 6
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	138	$ hg ready 6
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	139	$ hglog
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	140	@ 6 ready bfd1096b3dd69e57c184e9f43646a9b7e0dd5927
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	141	\|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	142	o 5 ready 8195da2a3c382a4acd7ce796b4bc74092f1875eb
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	143	\|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	144	\| o 4 draft 6aaadc67da669af964adabe681c0a78f46b7ce58
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	145	\|/
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	146	o 3 ready e7cd12398be70c568cefab9b4ad86a8a2a728a09
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	147	\|\
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	148	\| o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	149	\| \|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	150	o \| 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	151	\|/
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	152	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	153
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	154	$ hg strip -n 3
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	155	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	156	$ hglog
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	157	o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	158	\|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	159	\| @ 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	160	\|/
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	161	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	162
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	163	Quitelly the same as before but we strip before the merging node, from another
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	164	branch than the ready changeset, so this changeset is not a parent of the
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	165	the explicitly stripped node.
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	166	$ hg up 1
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	167	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	168	$ mkcommit 3
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	169	$ hg up 2
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	170	1 files updated, 0 files merged, 2 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	171	$ hg merge 3
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	172	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	173	(branch merge, don't forget to commit)
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	174	$ hg ci -m '4'
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	175	$ mkcommit 5
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	176	$ hg published 3
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	177	$ hg ready 4
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	178	$ hglog
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	179	@ 5 draft 0777a3135ec5396c57db4402c71ab8cba2a0ef7e
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	180	\|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	181	o 4 ready 667667458ecc8cf7763dee1ae172a5a9ebf115f3
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	182	\|\
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	183	\| o 3 published 03fc50a1c0074093104ff6c5357c486781742b64
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	184	\| \|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	185	o \| 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	186	\| \|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	187	\| o 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	188	\|/
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	189	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	190
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	191	$ hg strip -n 3
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	192	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	193	$ hglog
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	194	o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	195	\|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	196	\| @ 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	197	\|/
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	198	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	199
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	200
99 67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	201	pathologic case
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	202	$ hg up 1
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	203	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	204	$ mkcommit 3
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	205	$ hg up 2
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	206	1 files updated, 0 files merged, 2 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	207	$ hg merge 3
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	208	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	209	(branch merge, don't forget to commit)
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	210	$ hg ci -m '4'
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	211	$ mkcommit 5
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	212	$ hg up 3
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	213	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	214	$ mkcommit 6
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	215	created new head
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	216	$ hg published 3
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	217	$ hg ready 4
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	218	$ hglog
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	219	@ 6 draft aeb74c71311d9305498bbf371746d095b80ff51f
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	220	\|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	221	\| o 5 draft 0777a3135ec5396c57db4402c71ab8cba2a0ef7e
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	222	\| \|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	223	\| o 4 ready 667667458ecc8cf7763dee1ae172a5a9ebf115f3
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	224	\|/\|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	225	o \| 3 published 03fc50a1c0074093104ff6c5357c486781742b64
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	226	\| \|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	227	\| o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	228	\| \|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	229	o \| 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	230	\|/
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	231	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	232
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	233	$ hg strip -n 3
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	234	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	235	$ hglog
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	236	o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	237	\|
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	238	\| @ 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	239	\|/
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	240	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
67a3aa020d91 [states] fix strip but a case still does not work (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: diff changeset	241
100 7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	242	pathologic case
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	243	$ hg up 1
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	244	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	245	$ hg merge 2
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	246	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	247	(branch merge, don't forget to commit)
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	248	$ hg ci -m 3
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	249	$ hg up 2
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	250	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	251	$ mkcommit 4
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	252	created new head
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	253	$ hg merge 3
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	254	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	255	(branch merge, don't forget to commit)
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	256	$ hg ci -m 5
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	257	$ hg up 4
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	258	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	259	$ mkcommit 6
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	260	created new head
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	261	$ hg ready 4
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	262	$ hglog
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	263	@ 6 draft 036d507f2b771a3b7cc88580c93d5037bf4bf1bf
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	264	\|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	265	\| o 5 draft 19788060dab104e9385a14c4be2fc5678b9433f0
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	266	\|/\|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	267	o \| 4 ready 0fc8455e844047eab375a1f51816f697551e34cf
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	268	\| \|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	269	\| o 3 draft e7cd12398be70c568cefab9b4ad86a8a2a728a09
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	270	\|/\|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	271	o \| 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	272	\| \|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	273	\| o 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	274	\|/
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	275	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	276
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	277	$ hg strip -n 1
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	278	$ hglog
101 21dbec91e775 fix strip - seems good enougth now Alain Leufroy <alain.leufroy@logilab.fr> parents: 100 diff changeset	279	@ 6 draft 036d507f2b771a3b7cc88580c93d5037bf4bf1bf
100 7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	280	\|
101 21dbec91e775 fix strip - seems good enougth now Alain Leufroy <alain.leufroy@logilab.fr> parents: 100 diff changeset	281	o 4 ready 0fc8455e844047eab375a1f51816f697551e34cf
100 7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	282	\|
101 21dbec91e775 fix strip - seems good enougth now Alain Leufroy <alain.leufroy@logilab.fr> parents: 100 diff changeset	283	o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88
100 7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	284	\|
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	285	o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d
7d0617e584ff [states] fix strip but one thing still stay wrong (see test test-state-strip.t) Alain Leufroy <alain.leufroy@logilab.fr> parents: 99 diff changeset	286
101 21dbec91e775 fix strip - seems good enougth now Alain Leufroy <alain.leufroy@logilab.fr> parents: 100 diff changeset	287	$ hg log --template '{desc} {state} {node}\n' -r 'readyheads()'
21dbec91e775 fix strip - seems good enougth now Alain Leufroy <alain.leufroy@logilab.fr> parents: 100 diff changeset	288	4 ready 0fc8455e844047eab375a1f51816f697551e34cf

author	Alain Leufroy <alain.leufroy@logilab.fr>
	Thu, 29 Sep 2011 15:23:56 +0200
changeset 102	5111329280f1
parent 101	21dbec91e775
permissions	-rwxr-xr-x