mercurial: tests/test-histedit-obsolete.t@35513c59f376 (annotated)

17759 9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	1	$ . "$TESTDIR/histedit-helpers.sh"
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	2
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	3	Enable obsolete
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	4
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	5	$ cat > ${TESTTMP}/obs.py << EOF
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	6	> import mercurial.obsolete
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	7	> mercurial.obsolete._enabled = True
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	8	> EOF
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	9
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	10	$ cat >> $HGRCPATH << EOF
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	11	> [ui]
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	12	> logtemplate= {rev}:{node\|short} {desc\|firstline}
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	13	> [phases]
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	14	> publish=False
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	15	> [extensions]'
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	16	> histedit=
18438 81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	17	> rebase=
17759 9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	18	>
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	19	> obs=${TESTTMP}/obs.py
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	20	> EOF
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	21
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	22	$ hg init base
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	23	$ cd base
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	24
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	25	$ for x in a b c d e f ; do
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	26	> echo $x > $x
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	27	> hg add $x
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	28	> hg ci -m $x
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	29	> done
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	30
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	31	$ hg log --graph
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	32	@ 5:652413bf663e f
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	33	\|
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	34	o 4:e860deea161a e
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	35	\|
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	36	o 3:055a42cdd887 d
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	37	\|
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	38	o 2:177f92b77385 c
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	39	\|
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	40	o 1:d2ae7f538514 b
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	41	\|
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	42	o 0:cb9a9f314b8b a
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	43
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	44
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	45	$ HGEDITOR=cat hg histedit 1
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	46	pick d2ae7f538514 1 b
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	47	pick 177f92b77385 2 c
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	48	pick 055a42cdd887 3 d
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	49	pick e860deea161a 4 e
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	50	pick 652413bf663e 5 f
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	51
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	52	# Edit history between d2ae7f538514 and 652413bf663e
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	53	#
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	54	# Commands:
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	55	# p, pick = use commit
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	56	# e, edit = use commit, but stop for amending
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	57	# f, fold = use commit, but fold into previous commit (combines N and N-1)
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	58	# d, drop = remove commit from history
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	59	# m, mess = edit message without changing commit content
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	60	#
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	61	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
17764 c1b661ee29ff test: fix invalid redirection for histedit text Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17762 diff changeset	62	$ cat > commands.txt <<EOF
17759 9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	63	> pick 177f92b77385 2 c
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	64	> drop d2ae7f538514 1 b
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	65	> pick 055a42cdd887 3 d
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	66	> fold e860deea161a 4 e
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	67	> pick 652413bf663e 5 f
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	68	> EOF
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	69	$ hg histedit 1 --commands commands.txt --verbose \| grep histedit
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	70	saved backup bundle to $TESTTMP/base/.hg/strip-backup/96e494a2d553-backup.hg (glob)
17759 9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	71	$ hg log --graph --hidden
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	72	@ 8:cacdfd884a93 f
17759 9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	73	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	74	o 7:59d9f330561f d
17759 9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	75	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	76	o 6:b346ab9a313d c
17759 9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	77	\|
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	78	\| x 5:652413bf663e f
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	79	\| \|
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	80	\| x 4:e860deea161a e
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	81	\| \|
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	82	\| x 3:055a42cdd887 d
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	83	\| \|
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	84	\| x 2:177f92b77385 c
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	85	\| \|
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	86	\| x 1:d2ae7f538514 b
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	87	\|/
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	88	o 0:cb9a9f314b8b a
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	89
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	90	$ hg debugobsolete
17771 dcfa526b180b histedit: create obsolescence markers in deterministic order Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17764 diff changeset	91	d2ae7f538514cd87c17547b0de4cea71fe1af9fb 0 {'date': '* *', 'user': 'test'} (glob)
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	92	177f92b773850b59254aa5e923436f921b55483b b346ab9a313db8537ecf96fca3ca3ca984ef3bd7 0 {'date': '* *', 'user': 'test'} (glob)
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	93	055a42cdd88768532f9cf79daa407fc8d138de9b 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 {'date': '* *', 'user': 'test'} (glob)
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	94	e860deea161a2f77de56603b340ebbb4536308ae 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 {'date': '* *', 'user': 'test'} (glob)
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	95	652413bf663ef2a641cab26574e46d5f5a64a55a cacdfd884a9321ec4e1de275ef3949fa953a1f83 0 {'date': '* *', 'user': 'test'} (glob)
17771 dcfa526b180b histedit: create obsolescence markers in deterministic order Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17764 diff changeset	96
17761 c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	97
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	98	Ensure hidden revision does not prevent histedit
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	99	-------------------------------------------------
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	100
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	101	create an hidden revision
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	102
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	103	$ cat > commands.txt <<EOF
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	104	> pick b346ab9a313d 6 c
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	105	> drop 59d9f330561f 7 d
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	106	> pick cacdfd884a93 8 f
17761 c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	107	> EOF
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	108	$ hg histedit 6 --commands commands.txt
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	109	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	110	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	111	$ hg log --graph
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	112	@ 9:c13eb81022ca f
17761 c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	113	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	114	o 6:b346ab9a313d c
17761 c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	115	\|
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	116	o 0:cb9a9f314b8b a
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	117
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	118	check hidden revision are ignored (6 have hidden children 7 and 8)
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	119
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	120	$ cat > commands.txt <<EOF
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	121	> pick b346ab9a313d 6 c
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	122	> pick c13eb81022ca 8 f
17761 c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	123	> EOF
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	124	$ hg histedit 6 --commands commands.txt
c80a7a0c7d22 histedit: ignores hidden revision when checking for orphaned nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17759 diff changeset	125	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
17762 57f27cbfc5bb histedit: refuse to edit public changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17761 diff changeset	126
57f27cbfc5bb histedit: refuse to edit public changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17761 diff changeset	127
18165 0f5a0a2073a8 histedit: allow operation from non-head if obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17771 diff changeset	128
18398 1a00c8451640 test: fix in-test comments related to obsolescence Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18165 diff changeset	129	Test that rewriting leaving instability behind is allowed
1a00c8451640 test: fix in-test comments related to obsolescence Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18165 diff changeset	130	---------------------------------------------------------------------
18165 0f5a0a2073a8 histedit: allow operation from non-head if obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17771 diff changeset	131
0f5a0a2073a8 histedit: allow operation from non-head if obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17771 diff changeset	132	$ hg up '.^'
0f5a0a2073a8 histedit: allow operation from non-head if obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17771 diff changeset	133	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0f5a0a2073a8 histedit: allow operation from non-head if obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17771 diff changeset	134	$ hg log -r 'children(.)'
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18398 diff changeset	135	9:c13eb81022ca f (no-eol)
18438 81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	136	$ cat > commands.txt <<EOF
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	137	> edit b346ab9a313d 6 c
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	138	> EOF
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	139	$ hg histedit -r '.' --commands commands.txt
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	140	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	141	adding c
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	142	abort: Make changes as needed, you may commit or record as needed now.
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	143	When you are finished, run hg histedit --continue to resume.
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	144	[255]
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	145	$ echo c >> c
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	146	$ hg histedit --continue
18165 0f5a0a2073a8 histedit: allow operation from non-head if obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17771 diff changeset	147	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
18438 81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	148
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	149	$ hg log -r 'unstable()'
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	150	9:c13eb81022ca f (no-eol)
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	151
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	152	stabilise
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	153
81e77a8820f3 test-histedit: fix instability creation test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	154	$ hg rebase -r 'unstable()' -d .
18439 c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	155
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	156
18440 35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	157	Test phases support
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	158	===========================================
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	159
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	160	Check that histedit respect immutability
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	161	-------------------------------------------
18439 c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	162
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	163	$ cat >> $HGRCPATH << EOF
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	164	> [ui]
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	165	> logtemplate= {rev}:{node\|short} ({phase}) {desc\|firstline}\n
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	166	> EOF
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	167
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	168	$ hg ph -pv '.^'
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	169	phase changed for 2 changesets
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	170	$ hg log -G
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	171	@ 11:b449568bf7fc (draft) f
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	172	\|
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	173	o 10:40db8afa467b (public) c
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	174	\|
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	175	o 0:cb9a9f314b8b (public) a
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	176
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	177	$ hg histedit -r '.~2'
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	178	abort: cannot edit immutable changeset: cb9a9f314b8b
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	179	[255]
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	180
c6e3fa134da5 test-histedit: reorder phases test and prepare for more Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18438 diff changeset	181
18440 35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	182	Prepare further testing
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	183	-------------------------------------------
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	184
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	185	$ for x in g h i j k ; do
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	186	> echo $x > $x
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	187	> hg add $x
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	188	> hg ci -m $x
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	189	> done
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	190	$ hg phase --force --secret .~2
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	191	$ hg log -G
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	192	@ 16:ee118ab9fa44 (secret) k
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	193	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	194	o 15:3a6c53ee7f3d (secret) j
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	195	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	196	o 14:b605fb7503f2 (secret) i
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	197	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	198	o 13:7395e1ff83bd (draft) h
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	199	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	200	o 12:6b70183d2492 (draft) g
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	201	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	202	o 11:b449568bf7fc (draft) f
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	203	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	204	o 10:40db8afa467b (public) c
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	205	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	206	o 0:cb9a9f314b8b (public) a
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	207
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	208	$ cd ..
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	209
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	210	simple phase conservation
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	211	-------------------------------------------
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	212
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	213	Resulting changeset should conserve the phase of the original one whatever the
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	214	phases.new-commit option is.
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	215
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	216	New-commit as draft (default)
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	217
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	218	$ cp -r base simple-draft
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	219	$ cd simple-draft
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	220	$ cat > commands.txt <<EOF
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	221	> edit b449568bf7fc 11 f
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	222	> pick 6b70183d2492 12 g
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	223	> pick 7395e1ff83bd 13 h
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	224	> pick b605fb7503f2 14 i
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	225	> pick 3a6c53ee7f3d 15 j
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	226	> pick ee118ab9fa44 16 k
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	227	> EOF
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	228	$ hg histedit -r 'b449568bf7fc' --commands commands.txt
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	229	0 files updated, 0 files merged, 6 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	230	adding f
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	231	abort: Make changes as needed, you may commit or record as needed now.
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	232	When you are finished, run hg histedit --continue to resume.
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	233	[255]
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	234	$ echo f >> f
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	235	$ hg histedit --continue
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	236	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	237	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	238	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	239	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	240	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	241	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	242	$ hg log -G
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	243	@ 22:12e89af74238 (secret) k
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	244	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	245	o 21:636a8687b22e (secret) j
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	246	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	247	o 20:ccaf0a38653f (secret) i
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	248	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	249	o 19:11a89d1c2613 (draft) h
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	250	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	251	o 18:c1dec7ca82ea (draft) g
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	252	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	253	o 17:087281e68428 (draft) f
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	254	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	255	o 10:40db8afa467b (public) c
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	256	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	257	o 0:cb9a9f314b8b (public) a
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	258
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	259	$ cd ..
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	260
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	261
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	262	New-commit as draft (default)
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	263
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	264	$ cp -r base simple-secret
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	265	$ cd simple-secret
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	266	$ cat >> .hg/hgrc << EOF
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	267	> [phases]
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	268	> new-commit=secret
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	269	> EOF
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	270	$ cat > commands.txt <<EOF
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	271	> edit b449568bf7fc 11 f
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	272	> pick 6b70183d2492 12 g
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	273	> pick 7395e1ff83bd 13 h
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	274	> pick b605fb7503f2 14 i
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	275	> pick 3a6c53ee7f3d 15 j
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	276	> pick ee118ab9fa44 16 k
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	277	> EOF
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	278	$ hg histedit -r 'b449568bf7fc' --commands commands.txt
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	279	0 files updated, 0 files merged, 6 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	280	adding f
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	281	abort: Make changes as needed, you may commit or record as needed now.
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	282	When you are finished, run hg histedit --continue to resume.
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	283	[255]
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	284	$ echo f >> f
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	285	$ hg histedit --continue
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	286	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	287	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	288	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	289	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	290	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	291	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	292	$ hg log -G
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	293	@ 22:12e89af74238 (secret) k
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	294	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	295	o 21:636a8687b22e (secret) j
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	296	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	297	o 20:ccaf0a38653f (secret) i
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	298	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	299	o 19:11a89d1c2613 (draft) h
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	300	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	301	o 18:c1dec7ca82ea (draft) g
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	302	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	303	o 17:087281e68428 (draft) f
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	304	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	305	o 10:40db8afa467b (public) c
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	306	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	307	o 0:cb9a9f314b8b (public) a
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	308
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	309	$ cd ..
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	310
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	311
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	312	Changeset reordering
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	313	-------------------------------------------
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	314
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	315	If a secret changeset is put before a draft one, all descendant should be secret.
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	316	It seems more important to present the secret phase.
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	317
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	318	$ cp -r base reorder
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	319	$ cd reorder
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	320	$ cat > commands.txt <<EOF
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	321	> pick b449568bf7fc 11 f
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	322	> pick 3a6c53ee7f3d 15 j
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	323	> pick 6b70183d2492 12 g
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	324	> pick b605fb7503f2 14 i
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	325	> pick 7395e1ff83bd 13 h
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	326	> pick ee118ab9fa44 16 k
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	327	> EOF
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	328	$ hg histedit -r 'b449568bf7fc' --commands commands.txt
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	329	0 files updated, 0 files merged, 5 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	330	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	331	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	332	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	333	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	334	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	335	$ hg log -G
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	336	@ 21:558246857888 (secret) k
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	337	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	338	o 20:28bd44768535 (secret) h
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	339	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	340	o 19:d5395202aeb9 (secret) i
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	341	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	342	o 18:21edda8e341b (secret) g
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	343	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	344	o 17:5ab64f3a4832 (secret) j
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	345	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	346	o 11:b449568bf7fc (draft) f
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	347	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	348	o 10:40db8afa467b (public) c
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	349	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	350	o 0:cb9a9f314b8b (public) a
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	351
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	352	$ cd ..
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	353
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	354	Changeset folding
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	355	-------------------------------------------
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	356
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	357	Folding a secret changeset with a draft one turn the result secret (again,
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	358	better safe than sorry). Folding between same phase changeset still works
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	359
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	360	Note that there is a few reordering in this series for more extensive test
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	361
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	362	$ cp -r base folding
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	363	$ cd folding
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	364	$ cat >> .hg/hgrc << EOF
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	365	> [phases]
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	366	> new-commit=secret
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	367	> EOF
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	368	$ cat > commands.txt <<EOF
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	369	> pick 7395e1ff83bd 13 h
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	370	> fold b449568bf7fc 11 f
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	371	> pick 6b70183d2492 12 g
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	372	> fold 3a6c53ee7f3d 15 j
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	373	> pick b605fb7503f2 14 i
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	374	> fold ee118ab9fa44 16 k
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	375	> EOF
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	376	$ hg histedit -r 'b449568bf7fc' --commands commands.txt
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	377	0 files updated, 0 files merged, 6 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	378	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	379	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	380	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	381	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	382	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	383	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	384	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	385	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	386	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	387	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	388	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	389	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	390	saved backup bundle to $TESTTMP/folding/.hg/strip-backup/58019c66f35f-backup.hg (glob)
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	391	saved backup bundle to $TESTTMP/folding/.hg/strip-backup/83d1858e070b-backup.hg (glob)
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	392	saved backup bundle to $TESTTMP/folding/.hg/strip-backup/859969f5ed7e-backup.hg (glob)
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	393	$ hg log -G
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	394	@ 19:f9daec13fb98 (secret) i
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	395	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	396	o 18:49807617f46a (secret) g
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	397	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	398	o 17:050280826e04 (draft) h
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	399	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	400	o 10:40db8afa467b (public) c
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	401	\|
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	402	o 0:cb9a9f314b8b (public) a
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	403
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18439 diff changeset	404	$ cd ..

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
	Wed, 16 Jan 2013 19:21:03 +0100
changeset 18440	35513c59f376
parent 18439	c6e3fa134da5
child 18509	21daee53c101
permissions	-rw-r--r--