mercurial: tests/test-strip.t@5613fb1583d6 (annotated)

26929 e8e78a3d94b1 test: use generaldelta in 'test-strip.t' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26736 diff changeset	1	$ echo "[format]" >> $HGRCPATH
e8e78a3d94b1 test: use generaldelta in 'test-strip.t' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26736 diff changeset	2	$ echo "usegeneraldelta=yes" >> $HGRCPATH
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	3	$ echo "[extensions]" >> $HGRCPATH
19827 8b9c73ddeec1 strip: rename test-mq-strip into test-strip Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19090 diff changeset	4	$ echo "strip=" >> $HGRCPATH
33087 fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	5	$ echo "drawdag=$TESTDIR/drawdag.py" >> $HGRCPATH
8452 cb93eee1fbcd tests: add missing interpreter lines Martin Geisler <mg@lazybytes.net> parents: 6635 diff changeset	6
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	7	$ restore() {
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	8	> hg unbundle -q .hg/strip-backup/*
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	9	> rm .hg/strip-backup/*
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	10	> }
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	11	$ teststrip() {
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	12	> hg up -C $1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	13	> echo % before update $1, strip $2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	14	> hg parents
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	15	> hg --traceback strip $2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	16	> echo % after update $1, strip $2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	17	> hg parents
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	18	> restore
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	19	> }
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	20
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	21	$ hg init test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	22	$ cd test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	23
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	24	$ echo foo > bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	25	$ hg ci -Ama
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	26	adding bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	27
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	28	$ echo more >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	29	$ hg ci -Amb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	30
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	31	$ echo blah >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	32	$ hg ci -Amc
11200 12e5149cafca strip: improve full backup message Matt Mackall <mpm@selenic.com> parents: 8452 diff changeset	33
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	34	$ hg up 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	35	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	36	$ echo blah >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	37	$ hg ci -Amd
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	38	created new head
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	39
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	40	$ echo final >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	41	$ hg ci -Ame
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	42
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	43	$ hg log
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	44	changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	45	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	46	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	47	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	48	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	49
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	50	changeset: 3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	51	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	52	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	53	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	54	summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	55
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	56	changeset: 2:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	57	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	58	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	59	summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	60
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	61	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	62	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	63	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	64	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	65
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	66	changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	67	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	68	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	69	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	70
6635 d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	71
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	72	$ teststrip 4 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	73	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	74	% before update 4, strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	75	changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	76	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	77	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	78	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	79	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	80
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	81	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	82	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	83	% after update 4, strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	84	changeset: 3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	85	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	86	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	87	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	88	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	89	summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	90
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	91	$ teststrip 4 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	92	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	93	% before update 4, strip 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	94	changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	95	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	96	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	97	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	98	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	99
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	100	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	101	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	102	% after update 4, strip 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	103	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	104	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	105	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	106	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	107
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	108	$ teststrip 1 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	109	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	110	% before update 1, strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	111	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	112	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	113	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	114	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	115
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	116	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	117	% after update 1, strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	118	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	119	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	120	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	121	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	122
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	123	$ teststrip 4 2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	124	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	125	% before update 4, strip 2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	126	changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	127	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	128	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	129	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	130	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	131
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	132	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	133	% after update 4, strip 2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	134	changeset: 3:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	135	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	136	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	137	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	138	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	139
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	140	$ teststrip 4 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	141	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	142	% before update 4, strip 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	143	changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	144	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	145	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	146	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	147	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	148	summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	149
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	150	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	151	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	152	% after update 4, strip 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	153	changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	154	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	155	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	156	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	157	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	158
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	159	$ teststrip null 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	160	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	161	% before update null, strip 4
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	162	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	163	% after update null, strip 4
6635 d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	164
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	165	$ hg log
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	166	changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	167	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	168	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	169	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	170	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	171	summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	172
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	173	changeset: 3:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	174	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	175	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	176	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	177
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	178	changeset: 2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	179	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	180	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	181	summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	182
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	183	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	184	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	185	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	186	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	187
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	188	changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	189	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	190	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	191	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	192
23898 b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	193	$ hg up -C 4
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	194	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	195	$ hg parents
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	196	changeset: 4:264128213d29
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	197	tag: tip
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	198	parent: 1:ef3a871183d7
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	199	user: test
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	200	date: Thu Jan 01 00:00:00 1970 +0000
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	201	summary: c
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	202
23939 33d1b81c6ef0 repair._bundle: fix traceback for bad config value Eric Sumner <ericsumner@fb.com> parents: 23898 diff changeset	203
26423 c93f91c1db1c strip: use bundle2 + cg2 by default when repository use general delta Pierre-Yves David <pierre-yves.david@fb.com> parents: 26173 diff changeset	204	$ hg --traceback strip 4
23898 b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	205	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	206	saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob)
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	207	$ hg parents
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	208	changeset: 1:ef3a871183d7
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	209	user: test
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	210	date: Thu Jan 01 00:00:00 1970 +0000
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	211	summary: b
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	212
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	213	$ hg debugbundle .hg/strip-backup/*
34025 626a28f30dbd debugcommands: stabilize output of debugbundle by having a custom repr Augie Fackler <raf@durin42.com> parents: 33987 diff changeset	214	Stream params: {Compression: BZ}
626a28f30dbd debugcommands: stabilize output of debugbundle by having a custom repr Augie Fackler <raf@durin42.com> parents: 33987 diff changeset	215	changegroup -- {nbchanges: 1, version: 02}
26929 e8e78a3d94b1 test: use generaldelta in 'test-strip.t' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26736 diff changeset	216	264128213d290d868c54642d13aeaa3675551a78
34025 626a28f30dbd debugcommands: stabilize output of debugbundle by having a custom repr Augie Fackler <raf@durin42.com> parents: 33987 diff changeset	217	phase-heads -- {}
33032 8e3021fd1a44 strip: include phases in bundle (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 32698 diff changeset	218	264128213d290d868c54642d13aeaa3675551a78 draft
24073 ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	219	$ hg pull .hg/strip-backup/*
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	220	pulling from .hg/strip-backup/264128213d29-0b39d6bf-backup.hg
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	221	searching for changes
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	222	adding changesets
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	223	adding manifests
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	224	adding file changes
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	225	added 1 changesets with 0 changes to 0 files (+1 heads)
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	226	(run 'hg heads' to see heads, 'hg merge' to merge)
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	227	$ rm .hg/strip-backup/*
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	228	$ hg log --graph
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	229	o changeset: 4:264128213d29
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	230	\| tag: tip
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	231	\| parent: 1:ef3a871183d7
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	232	\| user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	233	\| date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	234	\| summary: c
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	235	\|
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	236	\| o changeset: 3:443431ffac4f
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	237	\| \| user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	238	\| \| date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	239	\| \| summary: e
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	240	\| \|
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	241	\| o changeset: 2:65bd5f99a4a3
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	242	\|/ user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	243	\| date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	244	\| summary: d
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	245	\|
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	246	@ changeset: 1:ef3a871183d7
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	247	\| user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	248	\| date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	249	\| summary: b
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	250	\|
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	251	o changeset: 0:9ab35a2d17cb
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	252	user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	253	date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	254	summary: a
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	255
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	256	$ hg up -C 2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	257	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	258	$ hg merge 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	259	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	260	(branch merge, don't forget to commit)
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	261
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	262	before strip of merge parent
6635 d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	263
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	264	$ hg parents
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	265	changeset: 2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	266	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	267	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	268	summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	269
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	270	changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	271	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	272	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	273	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	274	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	275	summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	276
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	277	$ hg strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	278	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	279	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	280
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	281	after strip of merge parent
6635 d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	282
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	283	$ hg parents
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	284	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	285	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	286	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	287	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	288
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	289	$ restore
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	290
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	291	$ hg up
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	292	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
32698 1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC) Pulkit Goyal <7895pulkit@gmail.com> parents: 32267 diff changeset	293	updated to "264128213d29: c"
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27177 diff changeset	294	1 other heads for branch "default"
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19951 diff changeset	295	$ hg log -G
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	296	@ changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	297	\| tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	298	\| parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	299	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	300	\| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	301	\| summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	302	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	303	\| o changeset: 3:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	304	\| \| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	305	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	306	\| \| summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	307	\| \|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	308	\| o changeset: 2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	309	\|/ user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	310	\| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	311	\| summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	312	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	313	o changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	314	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	315	\| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	316	\| summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	317	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	318	o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	319	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	320	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	321	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	322
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	323
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	324	2 is parent of 3, only one strip should happen
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11637 diff changeset	325
12767 c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	326	$ hg strip "roots(2)" 3
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	327	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19951 diff changeset	328	$ hg log -G
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	329	@ changeset: 2:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	330	\| tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	331	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	332	\| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	333	\| summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	334	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	335	o changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	336	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	337	\| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	338	\| summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	339	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	340	o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	341	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	342	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	343	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	344
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	345	$ restore
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19951 diff changeset	346	$ hg log -G
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	347	o changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	348	\| tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	349	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	350	\| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	351	\| summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	352	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	353	o changeset: 3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	354	\| parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	355	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	356	\| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	357	\| summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	358	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	359	\| @ changeset: 2:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	360	\|/ user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	361	\| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	362	\| summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	363	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	364	o changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	365	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	366	\| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	367	\| summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	368	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	369	o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	370	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	371	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	372	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	373
29952 44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	374	Failed hook while applying "saveheads" bundle.
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	375
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	376	$ hg strip 2 --config hooks.pretxnchangegroup.bad=false
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	377	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	378	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	379	transaction abort!
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	380	rollback completed
29954 769aee32fae0 strip: don't use "full" and "partial" to describe bundles Martin von Zweigbergk <martinvonz@google.com> parents: 29953 diff changeset	381	strip failed, backup bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob)
29953 94ebf56db04e strip: clarify that user action is required to recover temp bundle Martin von Zweigbergk <martinvonz@google.com> parents: 29952 diff changeset	382	strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob)
94ebf56db04e strip: clarify that user action is required to recover temp bundle Martin von Zweigbergk <martinvonz@google.com> parents: 29952 diff changeset	383	(fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob)
29952 44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	384	abort: pretxnchangegroup.bad hook exited with status 1
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	385	[255]
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	386	$ restore
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	387	$ hg log -G
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	388	o changeset: 4:443431ffac4f
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	389	\| tag: tip
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	390	\| user: test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	391	\| date: Thu Jan 01 00:00:00 1970 +0000
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	392	\| summary: e
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	393	\|
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	394	o changeset: 3:65bd5f99a4a3
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	395	\| parent: 1:ef3a871183d7
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	396	\| user: test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	397	\| date: Thu Jan 01 00:00:00 1970 +0000
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	398	\| summary: d
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	399	\|
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	400	\| o changeset: 2:264128213d29
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	401	\|/ user: test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	402	\| date: Thu Jan 01 00:00:00 1970 +0000
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	403	\| summary: c
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	404	\|
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	405	@ changeset: 1:ef3a871183d7
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	406	\| user: test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	407	\| date: Thu Jan 01 00:00:00 1970 +0000
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	408	\| summary: b
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	409	\|
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	410	o changeset: 0:9ab35a2d17cb
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	411	user: test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	412	date: Thu Jan 01 00:00:00 1970 +0000
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	413	summary: a
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	414
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	415
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	416	2 different branches: 2 strips
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11637 diff changeset	417
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	418	$ hg strip 2 4
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	419	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19951 diff changeset	420	$ hg log -G
18371 ff2c89ebf5d4 mq: stabilize update after strip of parent revision Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	421	o changeset: 2:65bd5f99a4a3
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	422	\| tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	423	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	424	\| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	425	\| summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	426	\|
18371 ff2c89ebf5d4 mq: stabilize update after strip of parent revision Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	427	@ changeset: 1:ef3a871183d7
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	428	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	429	\| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	430	\| summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	431	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	432	o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	433	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	434	date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	435	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	436
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	437	$ restore
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	438
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	439	2 different branches and a common ancestor: 1 strip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	440
12767 c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	441	$ hg strip 1 "2\|4"
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	442	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	443	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	444	$ restore
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	445
20885 f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	446	verify fncache is kept up-to-date
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	447
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	448	$ touch a
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	449	$ hg ci -qAm a
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	450	$ cat .hg/store/fncache \| sort
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	451	data/a.i
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	452	data/bar.i
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	453	$ hg strip tip
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	454	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	455	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	456	$ cat .hg/store/fncache
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	457	data/bar.i
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	458
12767 c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	459	stripping an empty revset
c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	460
c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	461	$ hg strip "1 and not 1"
c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	462	abort: empty revision set
c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	463	[255]
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	464
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	465	remove branchy history for qimport tests
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	466
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	467	$ hg strip 3
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	468	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11637 64f284da1278 mq: cleanup status if applied mq is stripped (issue1881) Vishakh H <vsh426@gmail.com> parents: 11208 diff changeset	469
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	470
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	471	strip of applied mq should cleanup status file
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	472
19827 8b9c73ddeec1 strip: rename test-mq-strip into test-strip Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19090 diff changeset	473	$ echo "mq=" >> $HGRCPATH
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	474	$ hg up -C 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	475	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	476	$ echo fooagain >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	477	$ hg ci -mf
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	478	$ hg qimport -r tip:2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	479
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	480	applied patches before strip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	481
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	482	$ hg qapplied
26736 143b52fce68e mq: generate patch names from first line of description Mads Kiilerich <mads@kiilerich.com> parents: 26429 diff changeset	483	d
143b52fce68e mq: generate patch names from first line of description Mads Kiilerich <mads@kiilerich.com> parents: 26429 diff changeset	484	e
143b52fce68e mq: generate patch names from first line of description Mads Kiilerich <mads@kiilerich.com> parents: 26429 diff changeset	485	f
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	486
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	487	stripping revision in queue
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	488
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	489	$ hg strip 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	490	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	491	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	492
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	493	applied patches after stripping rev in queue
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	494
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	495	$ hg qapplied
26736 143b52fce68e mq: generate patch names from first line of description Mads Kiilerich <mads@kiilerich.com> parents: 26429 diff changeset	496	d
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	497
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	498	stripping ancestor of queue
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	499
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	500	$ hg strip 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	501	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	502	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	503
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	504	applied patches after stripping ancestor of queue
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	505
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	506	$ hg qapplied
12682 58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	507
19951 d51c4d85ec23 spelling: random spell checker fixes Mads Kiilerich <madski@unity3d.com> parents: 19827 diff changeset	508	Verify strip protects against stripping wc parent when there are uncommitted mods
12682 58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	509
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	510	$ echo b > b
24709 69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	511	$ echo bb > bar
12682 58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	512	$ hg add b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	513	$ hg ci -m 'b'
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	514	$ hg log --graph
24709 69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	515	@ changeset: 1:76dcf9fab855
12682 58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	516	\| tag: tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	517	\| user: test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	518	\| date: Thu Jan 01 00:00:00 1970 +0000
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	519	\| summary: b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	520	\|
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	521	o changeset: 0:9ab35a2d17cb
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	522	user: test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	523	date: Thu Jan 01 00:00:00 1970 +0000
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	524	summary: a
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	525
24709 69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	526	$ hg up 0
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	527	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	528	$ echo c > bar
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	529	$ hg up -t false
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	530	merging bar
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	531	merging bar failed!
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	532	1 files updated, 0 files merged, 0 files removed, 1 files unresolved
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	533	use 'hg resolve' to retry unresolved file merges
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	534	[1]
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	535	$ hg sum
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	536	parent: 1:76dcf9fab855 tip
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	537	b
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	538	branch: default
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	539	commit: 1 modified, 1 unknown, 1 unresolved
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	540	update: (current)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25111 diff changeset	541	phases: 2 draft
24709 69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	542	mq: 3 unapplied
12682 58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	543
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	544	$ echo c > b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	545	$ hg strip tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	546	abort: local changes found
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	547	[255]
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	548	$ hg strip tip --keep
13572 1bb2a56a9d73 tests: use $TESTTMP more and use (glob) less Martin Geisler <mg@aragost.com> parents: 12767 diff changeset	549	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
12682 58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	550	$ hg log --graph
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	551	@ changeset: 0:9ab35a2d17cb
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	552	tag: tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	553	user: test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	554	date: Thu Jan 01 00:00:00 1970 +0000
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	555	summary: a
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	556
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	557	$ hg status
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	558	M bar
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	559	? b
24709 69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	560	? bar.orig
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	561
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	562	$ rm bar.orig
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	563	$ hg sum
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	564	parent: 0:9ab35a2d17cb tip
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	565	a
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	566	branch: default
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	567	commit: 1 modified, 1 unknown
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	568	update: (current)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25111 diff changeset	569	phases: 1 draft
24709 69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	570	mq: 3 unapplied
18760 e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	571
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	572	Strip adds, removes, modifies with --keep
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	573
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	574	$ touch b
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	575	$ hg add b
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	576	$ hg commit -mb
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	577	$ touch c
19090 ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	578
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	579	... with a clean working dir
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	580
18760 e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	581	$ hg add c
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	582	$ hg rm bar
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	583	$ hg commit -mc
19090 ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	584	$ hg status
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	585	$ hg strip --keep tip
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	586	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	587	$ hg status
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	588	! bar
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	589	? c
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	590
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	591	... with a dirty working dir
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	592
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	593	$ hg add c
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	594	$ hg rm bar
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	595	$ hg commit -mc
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	596	$ hg status
18760 e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	597	$ echo b > b
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	598	$ echo d > d
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	599	$ hg strip --keep tip
27177 e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	600	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
18760 e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	601	$ hg status
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	602	M b
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	603	! bar
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	604	? c
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	605	? d
27177 e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	606
e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	607	... after updating the dirstate
e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	608	$ hg add c
e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	609	$ hg commit -mc
e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	610	$ hg rm c
e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	611	$ hg commit -mc
e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	612	$ hg strip --keep '.^' -q
16252 cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	613	$ cd ..
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	614
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	615	stripping many nodes on a complex graph (issue3299)
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	616
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	617	$ hg init issue3299
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	618	$ cd issue3299
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	619	$ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a'
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	620	$ hg strip 'not ancestors(x)'
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	621	saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob)
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	622
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	623	test hg strip -B bookmark
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	624
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	625	$ cd ..
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	626	$ hg init bookmarks
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	627	$ cd bookmarks
27030 cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	628	$ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b<m+2:d<2.:e<m+1:f'
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	629	$ hg bookmark -r 'a' 'todelete'
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	630	$ hg bookmark -r 'b' 'B'
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	631	$ hg bookmark -r 'b' 'nostrip'
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	632	$ hg bookmark -r 'c' 'delete'
27030 cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	633	$ hg bookmark -r 'd' 'multipledelete1'
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	634	$ hg bookmark -r 'e' 'multipledelete2'
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	635	$ hg bookmark -r 'f' 'singlenode1'
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	636	$ hg bookmark -r 'f' 'singlenode2'
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	637	$ hg up -C todelete
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	638	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
21503 10f15e34d86c update: show message when a bookmark is activated by update Stephen Lee <sphen.lee@gmail.com> parents: 20885 diff changeset	639	(activating bookmark todelete)
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	640	$ hg strip -B nostrip
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	641	bookmark 'nostrip' deleted
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	642	abort: empty revision set
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	643	[255]
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	644	$ hg strip -B todelete
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	645	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	646	saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
21847 f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	647	bookmark 'todelete' deleted
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	648	$ hg id -ir dcbb326fdec2
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	649	abort: unknown revision 'dcbb326fdec2'!
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	650	[255]
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	651	$ hg id -ir d62d843c9a01
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	652	d62d843c9a01
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	653	$ hg bookmarks
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	654	B 9:ff43616e5d0f
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	655	delete 6:2702dd0c91e7
27030 cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	656	multipledelete1 11:e46a4836065c
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	657	multipledelete2 12:b4594d867745
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	658	singlenode1 13:43227190fef8
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	659	singlenode2 13:43227190fef8
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	660	$ hg strip -B multipledelete1 -B multipledelete2
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	661	saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg (glob)
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	662	bookmark 'multipledelete1' deleted
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	663	bookmark 'multipledelete2' deleted
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	664	$ hg id -ir e46a4836065c
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	665	abort: unknown revision 'e46a4836065c'!
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	666	[255]
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	667	$ hg id -ir b4594d867745
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	668	abort: unknown revision 'b4594d867745'!
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	669	[255]
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	670	$ hg strip -B singlenode1 -B singlenode2
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	671	saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg (glob)
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	672	bookmark 'singlenode1' deleted
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	673	bookmark 'singlenode2' deleted
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	674	$ hg id -ir 43227190fef8
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	675	abort: unknown revision '43227190fef8'!
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	676	[255]
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	677	$ hg strip -B unknownbookmark
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	678	abort: bookmark 'unknownbookmark' not found
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	679	[255]
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	680	$ hg strip -B unknownbookmark1 -B unknownbookmark2
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	681	abort: bookmark 'unknownbookmark1,unknownbookmark2' not found
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	682	[255]
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	683	$ hg strip -B delete -B unknownbookmark
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	684	abort: bookmark 'unknownbookmark' not found
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	685	[255]
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	686	$ hg strip -B delete
21847 f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	687	saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
16829 6403fdd716fe strip: move bookmark deletion before strip to deal with filecache invalidation Matt Mackall <mpm@selenic.com> parents: 16718 diff changeset	688	bookmark 'delete' deleted
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	689	$ hg id -ir 6:2702dd0c91e7
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	690	abort: unknown revision '2702dd0c91e7'!
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	691	[255]
21847 f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	692	$ hg update B
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	693	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	694	(activating bookmark B)
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	695	$ echo a > a
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	696	$ hg add a
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	697	$ hg strip -B B
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	698	abort: local changes found
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	699	[255]
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	700	$ hg bookmarks
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	701	* B 6:ff43616e5d0f
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16829 diff changeset	702
21854 ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	703	Make sure no one adds back a -b option:
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	704
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	705	$ hg strip -b tip
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	706	hg strip: option -b not recognized
28288 e417e4512b0f doc: remove deprecated option from synopsis of command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27177 diff changeset	707	hg strip [-k] [-f] [-B bookmark] [-r] REV...
21854 ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	708
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	709	strip changesets and all their descendants from the repository
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	710
29974 7109d5ddeb0c help: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29954 diff changeset	711	(use 'hg help -e strip' to show help for the strip extension)
21854 ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	712
22117 c1d93edcf004 help: fold repeatable option message into option table header Matt Mackall <mpm@selenic.com> parents: 22112 diff changeset	713	options ([+] can be repeated):
21854 ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	714
27030 cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	715	-r --rev REV [+] strip specified revision (optional, can specify
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	716	revisions without this option)
30152 d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30024 diff changeset	717	-f --force force removal of changesets, discard uncommitted
27030 cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	718	changes (no backup)
30152 d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30024 diff changeset	719	--no-backup no backups
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30024 diff changeset	720	-k --keep do not modify working directory during strip
27030 cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	721	-B --bookmark VALUE [+] remove revs only reachable from given bookmark
30152 d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30024 diff changeset	722	--mq operate on patch repository
21854 ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	723
29974 7109d5ddeb0c help: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29954 diff changeset	724	(use 'hg strip -h' to show more help)
21854 ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	725	[255]
23835 aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	726
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	727	$ cd ..
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	728
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	729	Verify bundles don't get overwritten:
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	730
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	731	$ hg init doublebundle
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	732	$ cd doublebundle
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	733	$ touch a
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	734	$ hg commit -Aqm a
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	735	$ touch b
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	736	$ hg commit -Aqm b
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	737	$ hg strip -r 0
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	738	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	739	saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg (glob)
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	740	$ ls .hg/strip-backup
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	741	3903775176ed-e68910bd-backup.hg
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	742	$ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	743	$ hg strip -r 0
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	744	saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg (glob)
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	745	$ ls .hg/strip-backup
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	746	3903775176ed-54390173-backup.hg
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	747	3903775176ed-e68910bd-backup.hg
25677 af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	748	$ cd ..
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	749
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	750	Test that we only bundle the stripped changesets (issue4736)
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	751	------------------------------------------------------------
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	752
26173 0f14c40a05c4 test-strip: fix spelling of initialization (en-US) timeless@mozdev.org parents: 26012 diff changeset	753	initialization (previous repo is empty anyway)
25677 af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	754
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	755	$ hg init issue4736
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	756	$ cd issue4736
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	757	$ echo a > a
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	758	$ hg add a
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	759	$ hg commit -m commitA
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	760	$ echo b > b
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	761	$ hg add b
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	762	$ hg commit -m commitB
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	763	$ echo c > c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	764	$ hg add c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	765	$ hg commit -m commitC
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	766	$ hg up 'desc(commitB)'
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	767	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	768	$ echo d > d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	769	$ hg add d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	770	$ hg commit -m commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	771	created new head
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	772	$ hg up 'desc(commitC)'
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	773	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	774	$ hg merge 'desc(commitD)'
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	775	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	776	(branch merge, don't forget to commit)
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	777	$ hg ci -m 'mergeCD'
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	778	$ hg log -G
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	779	@ changeset: 4:d8db9d137221
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	780	\|\ tag: tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	781	\| \| parent: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	782	\| \| parent: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	783	\| \| user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	784	\| \| date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	785	\| \| summary: mergeCD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	786	\| \|
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	787	\| o changeset: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	788	\| \| parent: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	789	\| \| user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	790	\| \| date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	791	\| \| summary: commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	792	\| \|
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	793	o \| changeset: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	794	\|/ user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	795	\| date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	796	\| summary: commitC
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	797	\|
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	798	o changeset: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	799	\| user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	800	\| date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	801	\| summary: commitB
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	802	\|
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	803	o changeset: 0:105141ef12d0
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	804	user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	805	date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	806	summary: commitA
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	807
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	808
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	809	Check bundle behavior:
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	810
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	811	$ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	812	2 changesets found
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	813	$ hg log -r 'bundle()' -R ../issue4736.hg
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	814	changeset: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	815	parent: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	816	user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	817	date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	818	summary: commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	819
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	820	changeset: 4:d8db9d137221
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	821	tag: tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	822	parent: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	823	parent: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	824	user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	825	date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	826	summary: mergeCD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	827
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	828
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	829	check strip behavior
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	830
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	831	$ hg --config extensions.strip= strip 'desc(commitD)' --debug
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	832	resolving manifests
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	833	branchmerge: False, force: True, partial: False
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	834	ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	835	c: other deleted -> r
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	836	removing c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	837	d: other deleted -> r
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	838	removing d
28318 564a354f7f35 tests: flag Windows specific lines about background closing as optional Matt Harbison <matt_harbison@yahoo.com> parents: 28029 diff changeset	839	starting 4 threads for background file closing (?)
25677 af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	840	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	841	2 changesets found
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	842	list of changesets:
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	843	6625a516847449b6f0fa3737b9ba56e9f0f3032c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	844	d8db9d1372214336d2b5570f20ee468d2c72fa8b
33032 8e3021fd1a44 strip: include phases in bundle (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 32698 diff changeset	845	bundle2-output-bundle: "HG20", (1 params) 2 parts total
29593 953839de96ab bundle2: store changeset count when creating file bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 29592 diff changeset	846	bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
33032 8e3021fd1a44 strip: include phases in bundle (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 32698 diff changeset	847	bundle2-output-part: "phase-heads" 24 bytes payload
25677 af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	848	saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg (glob)
32267 c2380b448265 caches: move the 'updating the branch cache' message in 'updatecaches' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30152 diff changeset	849	updating the branch cache
25677 af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	850	invalid branchheads cache (served): tip differs
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	851	truncating cache/rbc-revs-v1 to 24
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	852	$ hg log -G
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	853	o changeset: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	854	\| tag: tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	855	\| user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	856	\| date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	857	\| summary: commitC
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	858	\|
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	859	@ changeset: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	860	\| user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	861	\| date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	862	\| summary: commitB
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	863	\|
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	864	o changeset: 0:105141ef12d0
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	865	user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	866	date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	867	summary: commitA
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	868
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	869
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	870	strip backup content
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	871
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	872	$ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	873	changeset: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	874	parent: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	875	user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	876	date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	877	summary: commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	878
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	879	changeset: 4:d8db9d137221
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	880	tag: tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	881	parent: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	882	parent: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	883	user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	884	date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	885	summary: mergeCD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	886
29196 bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	887	Check that the phase cache is properly invalidated after a strip with bookmark.
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	888
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	889	$ cat > ../stripstalephasecache.py << EOF
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	890	> from mercurial import extensions, localrepo
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	891	> def transactioncallback(orig, repo, desc, args, *kwargs):
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	892	> def test(transaction):
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	893	> # observe cache inconsistency
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	894	> try:
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	895	> [repo.changelog.node(r) for r in repo.revs("not public()")]
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	896	> except IndexError:
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	897	> repo.ui.status("Index error!\n")
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	898	> transaction = orig(repo, desc, args, *kwargs)
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	899	> # warm up the phase cache
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	900	> list(repo.revs("not public()"))
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	901	> if desc != 'strip':
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	902	> transaction.addpostclose("phase invalidation test", test)
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	903	> return transaction
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	904	> def extsetup(ui):
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	905	> extensions.wrapfunction(localrepo.localrepository, "transaction",
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	906	> transactioncallback)
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	907	> EOF
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	908	$ hg up -C 2
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	909	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	910	$ echo k > k
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	911	$ hg add k
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	912	$ hg commit -m commitK
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	913	$ echo l > l
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	914	$ hg add l
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	915	$ hg commit -m commitL
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	916	$ hg book -r tip blah
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	917	$ hg strip ".^" --config extensions.crash=$TESTTMP/stripstalephasecache.py
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	918	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	919	saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg (glob)
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	920	$ hg up -C 1
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	921	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
26012 d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	922
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	923	Error during post-close callback of the strip transaction
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	924	(They should be gracefully handled and reported)
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	925
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	926	$ cat > ../crashstrip.py << EOF
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	927	> from mercurial import error
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	928	> def reposetup(ui, repo):
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	929	> class crashstriprepo(repo.__class__):
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	930	> def transaction(self, desc, args, *kwargs):
33540 e07c5740eaaa test-strip: fix call to super class in crashstriprepo Boris Feld <boris.feld@octobus.net> parents: 33331 diff changeset	931	> tr = super(crashstriprepo, self).transaction(desc, args, *kwargs)
26012 d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	932	> if desc == 'strip':
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	933	> def crash(tra): raise error.Abort('boom')
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	934	> tr.addpostclose('crash', crash)
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	935	> return tr
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	936	> repo.__class__ = crashstriprepo
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	937	> EOF
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	938	$ hg strip tip --config extensions.crash=$TESTTMP/crashstrip.py
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	939	saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg (glob)
29954 769aee32fae0 strip: don't use "full" and "partial" to describe bundles Martin von Zweigbergk <martinvonz@google.com> parents: 29953 diff changeset	940	strip failed, backup bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg' (glob)
26012 d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	941	abort: boom
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	942	[255]
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	943
34621 5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	944	test stripping a working directory parent doesn't switch named branches
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	945
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	946	$ hg log -G
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	947	@ changeset: 1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	948	\| tag: tip
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	949	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	950	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	951	\| summary: commitB
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	952	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	953	o changeset: 0:105141ef12d0
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	954	user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	955	date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	956	summary: commitA
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	957
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	958
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	959	$ hg branch new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	960	marked working directory as branch new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	961	(branches are permanent and global, did you want a bookmark?)
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	962	$ hg ci -m "start new branch"
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	963	$ echo 'foo' > foo.txt
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	964	$ hg ci -Aqm foo
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	965	$ hg up default
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	966	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	967	$ echo 'bar' > bar.txt
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	968	$ hg ci -Aqm bar
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	969	$ hg up new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	970	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	971	$ hg merge default
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	972	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	973	(branch merge, don't forget to commit)
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	974	$ hg log -G
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	975	@ changeset: 4:35358f982181
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	976	\| tag: tip
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	977	\| parent: 1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	978	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	979	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	980	\| summary: bar
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	981	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	982	\| @ changeset: 3:f62c6c09b707
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	983	\| \| branch: new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	984	\| \| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	985	\| \| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	986	\| \| summary: foo
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	987	\| \|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	988	\| o changeset: 2:b1d33a8cadd9
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	989	\|/ branch: new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	990	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	991	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	992	\| summary: start new branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	993	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	994	o changeset: 1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	995	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	996	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	997	\| summary: commitB
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	998	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	999	o changeset: 0:105141ef12d0
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1000	user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1001	date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1002	summary: commitA
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1003
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1004
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1005	$ hg strip --force -r 35358f982181
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1006	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1007	saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-50d992d4-backup.hg (glob)
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1008	$ hg log -G
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1009	@ changeset: 3:f62c6c09b707
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1010	\| branch: new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1011	\| tag: tip
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1012	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1013	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1014	\| summary: foo
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1015	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1016	o changeset: 2:b1d33a8cadd9
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1017	\| branch: new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1018	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1019	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1020	\| summary: start new branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1021	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1022	o changeset: 1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1023	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1024	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1025	\| summary: commitB
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1026	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1027	o changeset: 0:105141ef12d0
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1028	user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1029	date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1030	summary: commitA
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1031
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1032
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1033	$ hg up default
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1034	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1035	$ echo 'bar' > bar.txt
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1036	$ hg ci -Aqm bar
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1037	$ hg up new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1038	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1039	$ hg merge default
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1040	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1041	(branch merge, don't forget to commit)
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1042	$ hg ci -m merge
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1043	$ hg log -G
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1044	@ changeset: 5:4cf5e92caec2
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1045	\|\ branch: new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1046	\| \| tag: tip
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1047	\| \| parent: 3:f62c6c09b707
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1048	\| \| parent: 4:35358f982181
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1049	\| \| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1050	\| \| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1051	\| \| summary: merge
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1052	\| \|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1053	\| o changeset: 4:35358f982181
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1054	\| \| parent: 1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1055	\| \| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1056	\| \| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1057	\| \| summary: bar
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1058	\| \|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1059	o \| changeset: 3:f62c6c09b707
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1060	\| \| branch: new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1061	\| \| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1062	\| \| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1063	\| \| summary: foo
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1064	\| \|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1065	o \| changeset: 2:b1d33a8cadd9
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1066	\|/ branch: new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1067	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1068	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1069	\| summary: start new branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1070	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1071	o changeset: 1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1072	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1073	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1074	\| summary: commitB
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1075	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1076	o changeset: 0:105141ef12d0
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1077	user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1078	date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1079	summary: commitA
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1080
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1081
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1082	$ hg strip -r 35358f982181
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1083	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1084	saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg (glob)
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1085	$ hg log -G
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1086	@ changeset: 3:f62c6c09b707
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1087	\| branch: new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1088	\| tag: tip
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1089	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1090	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1091	\| summary: foo
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1092	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1093	o changeset: 2:b1d33a8cadd9
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1094	\| branch: new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1095	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1096	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1097	\| summary: start new branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1098	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1099	o changeset: 1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1100	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1101	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1102	\| summary: commitB
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1103	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1104	o changeset: 0:105141ef12d0
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1105	user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1106	date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1107	summary: commitA
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1108
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1109
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1110	$ hg pull -u $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1111	pulling from $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg (glob)
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1112	searching for changes
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1113	adding changesets
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1114	adding manifests
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1115	adding file changes
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1116	added 2 changesets with 1 changes to 1 files
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1117	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1118
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1119	$ hg strip -k -r 35358f982181
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1120	saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg (glob)
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1121	$ hg log -G
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1122	@ changeset: 3:f62c6c09b707
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1123	\| branch: new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1124	\| tag: tip
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1125	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1126	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1127	\| summary: foo
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1128	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1129	o changeset: 2:b1d33a8cadd9
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1130	\| branch: new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1131	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1132	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1133	\| summary: start new branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1134	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1135	o changeset: 1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1136	\| user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1137	\| date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1138	\| summary: commitB
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1139	\|
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1140	o changeset: 0:105141ef12d0
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1141	user: test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1142	date: Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1143	summary: commitA
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1144
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1145	$ hg diff
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1146	diff -r f62c6c09b707 bar.txt
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1147	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1148	+++ b/bar.txt Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1149	@@ -0,0 +1,1 @@
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1150	+bar
5613fb1583d6 strip: take branch into account when selecting update target (issue5540) Paul Morelle <paul.morelle@octobus.net> parents: 34453 diff changeset	1151
33087 fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1152	Use delayedstrip to strip inside a transaction
26012 d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	1153
33087 fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1154	$ cd $TESTTMP
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1155	$ hg init delayedstrip
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1156	$ cd delayedstrip
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1157	$ hg debugdrawdag <<'EOS'
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1158	> D
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1159	> \|
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1160	> C F H # Commit on top of "I",
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1161	> \| \|/\| # Strip B+D+I+E+G+H+Z
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1162	> I B E G
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1163	> \\|/
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1164	> A Z
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1165	> EOS
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1166	$ cp -R . ../scmutilcleanup
33087 fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1167
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1168	$ hg up -C I
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1169	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1170	$ echo 3 >> I
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1171	$ cat > $TESTTMP/delayedstrip.py <<EOF
33987 ed88f90bb787 tests: update test-strip to pass our import checker Augie Fackler <raf@durin42.com> parents: 33773 diff changeset	1172	> from __future__ import absolute_import
34453 40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1173	> from mercurial import commands, registrar, repair
40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1174	> cmdtable = {}
40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1175	> command = registrar.command(cmdtable)
40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1176	> @command('testdelayedstrip')
40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1177	> def testdelayedstrip(ui, repo):
33087 fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1178	> def getnodes(expr):
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1179	> return [repo.changelog.node(r) for r in repo.revs(expr)]
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1180	> with repo.wlock():
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1181	> with repo.lock():
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1182	> with repo.transaction('delayedstrip'):
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1183	> repair.delayedstrip(ui, repo, getnodes('B+I+Z+D+E'), 'J')
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1184	> repair.delayedstrip(ui, repo, getnodes('G+H+Z'), 'I')
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1185	> commands.commit(ui, repo, message='J', date='0 0')
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1186	> EOF
34453 40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1187	$ hg testdelayedstrip --config extensions.t=$TESTTMP/delayedstrip.py
33087 fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1188	warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22
33558 0103e7187237 drawdag: include files from both parents in merge commits Martin von Zweigbergk <martinvonz@google.com> parents: 33540 diff changeset	1189	saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg (glob)
34453 40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1190
33087 fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1191	$ hg log -G -T '{rev}:{node\|short} {desc}' -r 'sort(all(), topo)'
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1192	@ 6:2f2d51af6205 J
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1193	\|
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1194	o 3:08ebfeb61bac I
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1195	\|
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1196	\| o 5:64a8289d2492 F
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1197	\| \|
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1198	\| o 2:7fb047a69f22 E
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1199	\|/
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1200	\| o 4:26805aba1e60 C
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1201	\| \|
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1202	\| o 1:112478962961 B
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1203	\|/
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1204	o 0:426bada5c675 A
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction Jun Wu <quark@fb.com> parents: 33032 diff changeset	1205
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1206	Test high-level scmutil.cleanupnodes API
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1207
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1208	$ cd $TESTTMP/scmutilcleanup
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1209	$ hg debugdrawdag <<'EOS'
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1210	> D2 F2 G2 # D2, F2, G2 are replacements for D, F, G
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1211	> \| \| \|
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1212	> C H G
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1213	> EOS
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1214	$ for i in B C D F G I Z; do
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1215	> hg bookmark -i -r $i b-$i
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1216	> done
33331 4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33088 diff changeset	1217	$ hg bookmark -i -r E 'b-F@divergent1'
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33088 diff changeset	1218	$ hg bookmark -i -r H 'b-F@divergent2'
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33088 diff changeset	1219	$ hg bookmark -i -r G 'b-F@divergent3'
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1220	$ cp -R . ../scmutilcleanup.obsstore
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1221
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1222	$ cat > $TESTTMP/scmutilcleanup.py <<EOF
34453 40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1223	> from mercurial import registrar, scmutil
40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1224	> cmdtable = {}
40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1225	> command = registrar.command(cmdtable)
40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1226	> @command('testnodescleanup')
40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1227	> def testnodescleanup(ui, repo):
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1228	> def nodes(expr):
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1229	> return [repo.changelog.node(r) for r in repo.revs(expr)]
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1230	> def node(expr):
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1231	> return nodes(expr)[0]
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1232	> with repo.wlock():
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1233	> with repo.lock():
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1234	> with repo.transaction('delayedstrip'):
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1235	> mapping = {node('F'): [node('F2')],
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1236	> node('D'): [node('D2')],
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1237	> node('G'): [node('G2')]}
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1238	> scmutil.cleanupnodes(repo, mapping, 'replace')
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1239	> scmutil.cleanupnodes(repo, nodes('((B::)+I+Z)-D2'), 'replace')
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1240	> EOF
34453 40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1241	$ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1242	warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1243	saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg (glob)
34453 40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1244
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1245	$ hg log -G -T '{rev}:{node\|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
33331 4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33088 diff changeset	1246	o 8:1473d4b996d1 G2 b-F@divergent3 b-G
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1247	\|
33558 0103e7187237 drawdag: include files from both parents in merge commits Martin von Zweigbergk <martinvonz@google.com> parents: 33540 diff changeset	1248	\| o 7:d11b3456a873 F2 b-F
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1249	\| \|
33558 0103e7187237 drawdag: include files from both parents in merge commits Martin von Zweigbergk <martinvonz@google.com> parents: 33540 diff changeset	1250	\| o 5:5cb05ba470a7 H
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1251	\|/\|
33331 4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33088 diff changeset	1252	\| o 3:7fb047a69f22 E b-F@divergent1
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1253	\| \|
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1254	\| \| o 6:7c78f703e465 D2 b-D
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1255	\| \| \|
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1256	\| \| o 4:26805aba1e60 C
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1257	\| \| \|
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1258	\| \| o 2:112478962961 B
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1259	\| \|/
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1260	o \| 1:1fc8102cda62 G
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1261	/
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1262	o 0:426bada5c675 A b-B b-C b-I
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1263
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1264	$ hg bookmark
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1265	b-B 0:426bada5c675
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1266	b-C 0:426bada5c675
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1267	b-D 6:7c78f703e465
33558 0103e7187237 drawdag: include files from both parents in merge commits Martin von Zweigbergk <martinvonz@google.com> parents: 33540 diff changeset	1268	b-F 7:d11b3456a873
33331 4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33088 diff changeset	1269	b-F@divergent1 3:7fb047a69f22
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33088 diff changeset	1270	b-F@divergent3 8:1473d4b996d1
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1271	b-G 8:1473d4b996d1
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1272	b-I 0:426bada5c675
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1273	b-Z -1:000000000000
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1274
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1275	Test the above using obsstore "by the way". Not directly related to strip, but
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1276	we have reusable code here
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1277
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1278	$ cd $TESTTMP/scmutilcleanup.obsstore
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1279	$ cat >> .hg/hgrc <<EOF
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1280	> [experimental]
33773 6c1a9fd8361b test: update evolution config Boris Feld <boris.feld@octobus.net> parents: 33558 diff changeset	1281	> stabilization=all
6c1a9fd8361b test: update evolution config Boris Feld <boris.feld@octobus.net> parents: 33558 diff changeset	1282	> stabilization.track-operation=1
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1283	> EOF
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1284
34453 40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1285	$ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
40b6d25ed2d5 test-strip: make test compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 34286 diff changeset	1286
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1287	$ rm .hg/localtags
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1288	$ hg log -G -T '{rev}:{node\|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
33331 4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33088 diff changeset	1289	o 12:1473d4b996d1 G2 b-F@divergent3 b-G
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1290	\|
33558 0103e7187237 drawdag: include files from both parents in merge commits Martin von Zweigbergk <martinvonz@google.com> parents: 33540 diff changeset	1291	\| o 11:d11b3456a873 F2 b-F
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1292	\| \|
33558 0103e7187237 drawdag: include files from both parents in merge commits Martin von Zweigbergk <martinvonz@google.com> parents: 33540 diff changeset	1293	\| o 8:5cb05ba470a7 H
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1294	\|/\|
33331 4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33088 diff changeset	1295	\| o 4:7fb047a69f22 E b-F@divergent1
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1296	\| \|
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1297	\| \| o 10:7c78f703e465 D2 b-D
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1298	\| \| \|
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1299	\| \| x 6:26805aba1e60 C
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1300	\| \| \|
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1301	\| \| x 3:112478962961 B
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1302	\| \|/
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1303	x \| 1:1fc8102cda62 G
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1304	/
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1305	o 0:426bada5c675 A b-B b-C b-I
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1306
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1307	$ hg debugobsolete
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1308	1fc8102cda6204549f031015641606ccf5513ec3 1473d4b996d1d1b121de6b39fab6a04fbf9d873e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
33558 0103e7187237 drawdag: include files from both parents in merge commits Martin von Zweigbergk <martinvonz@google.com> parents: 33540 diff changeset	1309	64a8289d249234b9886244d379f15e6b650b28e3 d11b3456a873daec7c7bc53e5622e8df6d741bd2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1310	f585351a92f85104bff7c284233c338b10eb1df7 7c78f703e465d73102cc8780667ce269c5208a40 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1311	48b9aae0607f43ff110d84e6883c151942add5ab 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1312	112478962961147124edd43549aedd1a335e44bf 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1313	08ebfeb61bac6e3f12079de774d285a0d6689eba 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 33087 diff changeset	1314	26805aba1e600a82e93661149f2313866a221a7b 0 {112478962961147124edd43549aedd1a335e44bf} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
34143 b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1315	$ cd ..
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1316
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1317	Test that obsmarkers are restored even when not using generaldelta
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1318
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1319	$ hg --config format.usegeneraldelta=no init issue5678
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1320	$ cd issue5678
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1321	$ cat >> .hg/hgrc <<EOF
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1322	> [experimental]
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1323	> evolution=all
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1324	> EOF
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1325	$ echo a > a
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1326	$ hg ci -Aqm a
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1327	$ hg ci --amend -m a2
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1328	$ hg debugobsolete
34286 ecc96506c49d obsmarker: track operation by default Martin von Zweigbergk <martinvonz@google.com> parents: 34257 diff changeset	1329	cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
34143 b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1330	$ hg strip .
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1331	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1332	saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg (glob)
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1333	$ hg unbundle -q .hg/strip-backup/*
b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1334	$ hg debugobsolete
34286 ecc96506c49d obsmarker: track operation by default Martin von Zweigbergk <martinvonz@google.com> parents: 34257 diff changeset	1335	cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
34143 b5d7e7d5c573 tests: add test for issue5678 Martin von Zweigbergk <martinvonz@google.com> parents: 33558 diff changeset	1336	$ cd ..

author	Paul Morelle <paul.morelle@octobus.net>
	Thu, 05 Oct 2017 16:13:05 +0200
changeset 34621	5613fb1583d6
parent 34453	40b6d25ed2d5
child 34661	eb586ed5d8ce
permissions	-rw-r--r--