mercurial: tests/test-strip.t@7109d5ddeb0c (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
8452 cb93eee1fbcd tests: add missing interpreter lines Martin Geisler <mg@lazybytes.net> parents: 6635 diff changeset	5
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	6	$ restore() {
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	7	> hg unbundle -q .hg/strip-backup/*
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	8	> rm .hg/strip-backup/*
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	9	> }
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	10	$ teststrip() {
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	11	> hg up -C $1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	12	> echo % before update $1, strip $2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	13	> hg parents
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	14	> hg --traceback strip $2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	15	> echo % after update $1, strip $2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	16	> hg parents
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	17	> restore
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	18	> }
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	$ hg init test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	21	$ cd test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	22
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	23	$ echo foo > bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	24	$ hg ci -Ama
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	25	adding bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	26
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	27	$ echo more >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	28	$ hg ci -Amb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	30	$ echo blah >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	31	$ hg ci -Amc
11200 12e5149cafca strip: improve full backup message Matt Mackall <mpm@selenic.com> parents: 8452 diff changeset	32
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	33	$ hg up 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	34	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	35	$ echo blah >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	36	$ hg ci -Amd
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	37	created new head
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	38
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	39	$ echo final >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	40	$ hg ci -Ame
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	41
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	42	$ hg log
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	43	changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	44	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	45	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	46	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	47	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	48
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	49	changeset: 3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	50	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	51	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	52	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	53	summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	54
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	55	changeset: 2:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	56	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	57	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	58	summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	59
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	60	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	61	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	62	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	63	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	64
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	65	changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	66	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	67	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	68	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	69
6635 d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	70
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	71	$ teststrip 4 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	72	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	73	% before update 4, strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	74	changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	75	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	76	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	77	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	78	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	79
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	80	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	81	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	82	% after update 4, strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	83	changeset: 3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	84	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	85	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	86	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	87	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	88	summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	89
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	90	$ teststrip 4 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	91	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	92	% before update 4, strip 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	93	changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	94	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	95	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	96	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	97	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	98
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	99	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	100	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	101	% after update 4, strip 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	102	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	103	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	104	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	105	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	106
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	107	$ teststrip 1 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	108	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	109	% before update 1, strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	110	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	111	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	112	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	113	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	114
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	115	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	116	% after update 1, strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	117	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	118	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	119	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	120	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	121
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	122	$ teststrip 4 2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	123	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	124	% before update 4, strip 2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	125	changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	126	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	127	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	128	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	129	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	130
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	131	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	132	% after update 4, strip 2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	133	changeset: 3:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	134	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	135	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	136	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	137	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	138
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	139	$ teststrip 4 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	140	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	141	% before update 4, strip 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	142	changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	143	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	144	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	145	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	146	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	147	summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	148
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	149	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	150	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	151	% after update 4, strip 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	152	changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	153	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	154	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	155	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	156	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	157
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	158	$ teststrip null 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	159	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	160	% before update null, strip 4
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	161	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	162	% 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	163
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	164	$ hg log
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	165	changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	166	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	167	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	168	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	169	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	170	summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	171
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	172	changeset: 3:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	173	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	174	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	175	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	176
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	177	changeset: 2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	178	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	179	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	180	summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	181
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	182	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	183	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	184	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	185	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	186
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	187	changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	188	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	189	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	190	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	191
23898 b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	192	$ hg up -C 4
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	193	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	194	$ hg parents
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	195	changeset: 4:264128213d29
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	196	tag: tip
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	197	parent: 1:ef3a871183d7
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	198	user: test
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	199	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	200	summary: c
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	201
23939 33d1b81c6ef0 repair._bundle: fix traceback for bad config value Eric Sumner <ericsumner@fb.com> parents: 23898 diff changeset	202
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	203	$ hg --traceback strip 4
23898 b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	204	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	205	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	206	$ hg parents
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	207	changeset: 1:ef3a871183d7
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	208	user: test
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	209	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	210	summary: b
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	211
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	212	$ hg debugbundle .hg/strip-backup/*
29592 37cccad55410 util: implement a deterministic __repr__ on sortdict Gregory Szorc <gregory.szorc@gmail.com> parents: 29196 diff changeset	213	Stream params: sortdict([('Compression', 'BZ')])
29593 953839de96ab bundle2: store changeset count when creating file bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 29592 diff changeset	214	changegroup -- "sortdict([('version', '02'), ('nbchanges', '1')])"
26929 e8e78a3d94b1 test: use generaldelta in 'test-strip.t' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26736 diff changeset	215	264128213d290d868c54642d13aeaa3675551a78
24073 ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	216	$ hg pull .hg/strip-backup/*
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	217	pulling from .hg/strip-backup/264128213d29-0b39d6bf-backup.hg
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	218	searching for changes
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	219	adding changesets
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	220	adding manifests
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	221	adding file changes
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	222	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	223	(run 'hg heads' to see heads, 'hg merge' to merge)
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	224	$ rm .hg/strip-backup/*
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	225	$ hg log --graph
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	226	o changeset: 4:264128213d29
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	227	\| tag: tip
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	228	\| parent: 1:ef3a871183d7
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	229	\| user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	230	\| date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	231	\| summary: c
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	232	\|
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	233	\| o changeset: 3:443431ffac4f
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	234	\| \| user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	235	\| \| date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	236	\| \| summary: e
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	237	\| \|
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	238	\| o changeset: 2:65bd5f99a4a3
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	239	\|/ user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	240	\| date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	241	\| summary: d
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	242	\|
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	243	@ changeset: 1:ef3a871183d7
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	244	\| user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	245	\| date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	246	\| summary: b
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	247	\|
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	248	o changeset: 0:9ab35a2d17cb
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	249	user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	250	date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	251	summary: a
ff5caa8dfd99 bundlerepo: basic bundle2 support Eric Sumner <ericsumner@fb.com> parents: 23939 diff changeset	252
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	253	$ hg up -C 2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	254	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	255	$ hg merge 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	256	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	257	(branch merge, don't forget to commit)
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	258
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	259	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	260
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	261	$ hg parents
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	262	changeset: 2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	263	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	264	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	265	summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	266
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	267	changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	268	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	269	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	270	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	271	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	272	summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	273
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	274	$ hg strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	275	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	276	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	277
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	278	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	279
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	280	$ hg parents
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	281	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	282	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	283	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	284	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	285
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	286	$ restore
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	287
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	288	$ hg up
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	289	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27177 diff changeset	290	1 other heads for branch "default"
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19951 diff changeset	291	$ hg log -G
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	292	@ changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	293	\| tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	294	\| parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	295	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	296	\| 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	297	\| summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	298	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	299	\| o changeset: 3:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	300	\| \| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	301	\| \| 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	302	\| \| summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	303	\| \|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	304	\| o changeset: 2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	305	\|/ user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	306	\| 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	307	\| summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	308	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	309	o changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	310	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	311	\| 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	312	\| summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	313	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	314	o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	315	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	316	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	317	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	318
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	319
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	320	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	321
12767 c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	322	$ hg strip "roots(2)" 3
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	323	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	324	$ hg log -G
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	325	@ changeset: 2:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	326	\| tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	327	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	328	\| 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	329	\| summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	330	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	331	o changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	332	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	333	\| 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	334	\| summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	335	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	336	o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	337	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	338	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	339	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	340
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	341	$ restore
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19951 diff changeset	342	$ hg log -G
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	343	o changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	344	\| tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	345	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	346	\| 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	347	\| summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	348	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	349	o changeset: 3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	350	\| parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	351	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	352	\| 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	353	\| summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	354	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	355	\| @ changeset: 2:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	356	\|/ user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	357	\| 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	358	\| summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	359	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	360	o changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	361	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	362	\| 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	363	\| summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	364	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	365	o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	366	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	367	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	368	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	369
29952 44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	370	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	371
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	372	$ 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	373	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	374	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	375	transaction abort!
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	376	rollback completed
29954 769aee32fae0 strip: don't use "full" and "partial" to describe bundles Martin von Zweigbergk <martinvonz@google.com> parents: 29953 diff changeset	377	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	378	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	379	(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	380	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	381	[255]
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	382	$ restore
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	383	$ hg log -G
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	384	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	385	\| tag: tip
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	386	\| user: test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	387	\| 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	388	\| summary: e
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	389	\|
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	390	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	391	\| parent: 1:ef3a871183d7
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	392	\| user: test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	393	\| 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	394	\| summary: d
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	395	\|
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	396	\| 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	397	\|/ user: test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	398	\| 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	399	\| summary: c
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	400	\|
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	401	@ changeset: 1:ef3a871183d7
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	402	\| user: test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	403	\| 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	404	\| summary: b
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	405	\|
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	406	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	407	user: test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	408	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	409	summary: a
44ef21621ad7 strip: report both bundle files in case of exception (issue5368) Martin von Zweigbergk <martinvonz@google.com> parents: 29593 diff changeset	410
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	411
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	412	2 different branches: 2 strips
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11637 diff changeset	413
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	414	$ hg strip 2 4
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	415	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	416	$ hg log -G
18371 ff2c89ebf5d4 mq: stabilize update after strip of parent revision Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	417	o changeset: 2:65bd5f99a4a3
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	418	\| tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	419	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	420	\| 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	421	\| summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	422	\|
18371 ff2c89ebf5d4 mq: stabilize update after strip of parent revision Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	423	@ changeset: 1:ef3a871183d7
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	424	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	425	\| 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	426	\| summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	427	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	428	o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	429	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	430	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	431	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	432
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	433	$ restore
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	434
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	435	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	436
12767 c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	437	$ hg strip 1 "2\|4"
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	438	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	439	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	440	$ restore
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	441
20885 f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	442	verify fncache is kept up-to-date
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	443
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	444	$ touch a
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	445	$ hg ci -qAm a
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	446	$ cat .hg/store/fncache \| sort
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	447	data/a.i
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	448	data/bar.i
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	449	$ hg strip tip
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	450	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	451	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	452	$ cat .hg/store/fncache
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	453	data/bar.i
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	454
12767 c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	455	stripping an empty revset
c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	456
c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	457	$ hg strip "1 and not 1"
c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	458	abort: empty revision set
c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	459	[255]
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	460
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	461	remove branchy history for qimport tests
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	462
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	463	$ hg strip 3
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	464	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	465
11906 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	strip of applied mq should cleanup status file
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	468
19827 8b9c73ddeec1 strip: rename test-mq-strip into test-strip Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19090 diff changeset	469	$ echo "mq=" >> $HGRCPATH
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	470	$ hg up -C 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	471	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	472	$ echo fooagain >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	473	$ hg ci -mf
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	474	$ hg qimport -r tip:2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	475
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	476	applied patches before strip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	477
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	478	$ hg qapplied
26736 143b52fce68e mq: generate patch names from first line of description Mads Kiilerich <mads@kiilerich.com> parents: 26429 diff changeset	479	d
143b52fce68e mq: generate patch names from first line of description Mads Kiilerich <mads@kiilerich.com> parents: 26429 diff changeset	480	e
143b52fce68e mq: generate patch names from first line of description Mads Kiilerich <mads@kiilerich.com> parents: 26429 diff changeset	481	f
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	482
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	483	stripping revision in queue
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	484
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	485	$ hg strip 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	486	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	487	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	488
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	489	applied patches after stripping rev in queue
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	490
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	491	$ hg qapplied
26736 143b52fce68e mq: generate patch names from first line of description Mads Kiilerich <mads@kiilerich.com> parents: 26429 diff changeset	492	d
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	493
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	494	stripping ancestor of queue
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	495
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	496	$ hg strip 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	497	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	498	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	499
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	500	applied patches after stripping ancestor of queue
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	501
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	502	$ hg qapplied
12682 58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	503
19951 d51c4d85ec23 spelling: random spell checker fixes Mads Kiilerich <madski@unity3d.com> parents: 19827 diff changeset	504	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	505
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	506	$ echo b > b
24709 69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	507	$ echo bb > bar
12682 58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	508	$ hg add b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	509	$ hg ci -m 'b'
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	510	$ hg log --graph
24709 69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	511	@ changeset: 1:76dcf9fab855
12682 58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	512	\| tag: tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	513	\| user: test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	514	\| 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	515	\| summary: b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	516	\|
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	517	o changeset: 0:9ab35a2d17cb
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	518	user: test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	519	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	520	summary: a
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	521
24709 69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	522	$ hg up 0
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	523	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	524	$ echo c > bar
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	525	$ hg up -t false
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	526	merging bar
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	527	merging bar failed!
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	528	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	529	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	530	[1]
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	531	$ hg sum
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	532	parent: 1:76dcf9fab855 tip
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	533	b
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	534	branch: default
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	535	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	536	update: (current)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25111 diff changeset	537	phases: 2 draft
24709 69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	538	mq: 3 unapplied
12682 58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	539
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	540	$ echo c > b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	541	$ hg strip tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	542	abort: local changes found
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	543	[255]
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	544	$ hg strip tip --keep
13572 1bb2a56a9d73 tests: use $TESTTMP more and use (glob) less Martin Geisler <mg@aragost.com> parents: 12767 diff changeset	545	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	546	$ hg log --graph
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	547	@ changeset: 0:9ab35a2d17cb
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	548	tag: tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	549	user: test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	550	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	551	summary: a
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	552
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	553	$ hg status
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	554	M bar
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	555	? b
24709 69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	556	? bar.orig
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	557
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	558	$ rm bar.orig
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	559	$ hg sum
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	560	parent: 0:9ab35a2d17cb tip
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	561	a
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	562	branch: default
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	563	commit: 1 modified, 1 unknown
69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	564	update: (current)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25111 diff changeset	565	phases: 1 draft
24709 69154e0ae384 strip: properly clear resolve state with --keep (issue4593) Matt Mackall <mpm@selenic.com> parents: 24686 diff changeset	566	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	567
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	568	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	569
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	570	$ touch b
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	571	$ hg add b
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	572	$ hg commit -mb
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	573	$ 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	574
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	575	... 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	576
18760 e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	577	$ hg add c
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	578	$ hg rm bar
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	579	$ 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	580	$ 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	581	$ 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	582	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	583	$ 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	584	! 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	585	? 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	586
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	... 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	588
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	$ 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	590	$ 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	591	$ 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	592	$ hg status
18760 e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	593	$ echo b > b
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	594	$ echo d > d
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	595	$ 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	596	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	597	$ hg status
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	598	M b
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	599	! bar
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	600	? c
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	601	? d
27177 e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	602
e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	603	... 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	604	$ hg add c
e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	605	$ hg commit -mc
e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	606	$ hg rm c
e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	607	$ hg commit -mc
e76b27a642ca strip: add a --keep test related to removing files from dirstate Christian Delahousse <cdelahousse@fb.com> parents: 27030 diff changeset	608	$ 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	609	$ cd ..
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	610
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	611	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	612
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	613	$ 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	614	$ cd issue3299
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	615	$ 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	616	$ 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	617	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	618
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	619	test hg strip -B bookmark
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	620
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	621	$ cd ..
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	622	$ hg init bookmarks
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	623	$ cd bookmarks
27030 cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	624	$ 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	625	$ hg bookmark -r 'a' 'todelete'
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	626	$ hg bookmark -r 'b' 'B'
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	627	$ hg bookmark -r 'b' 'nostrip'
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	628	$ 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	629	$ hg bookmark -r 'd' 'multipledelete1'
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	630	$ hg bookmark -r 'e' 'multipledelete2'
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	631	$ hg bookmark -r 'f' 'singlenode1'
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	632	$ 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	633	$ hg up -C todelete
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	634	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	635	(activating bookmark todelete)
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	636	$ hg strip -B nostrip
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	637	bookmark 'nostrip' deleted
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	638	abort: empty revision set
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	639	[255]
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	640	$ hg strip -B todelete
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	641	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	642	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	643	bookmark 'todelete' deleted
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	644	$ hg id -ir dcbb326fdec2
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	645	abort: unknown revision 'dcbb326fdec2'!
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	646	[255]
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	647	$ hg id -ir d62d843c9a01
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	648	d62d843c9a01
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	649	$ hg bookmarks
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	650	B 9:ff43616e5d0f
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	651	delete 6:2702dd0c91e7
27030 cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	652	multipledelete1 11:e46a4836065c
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	653	multipledelete2 12:b4594d867745
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	654	singlenode1 13:43227190fef8
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	655	singlenode2 13:43227190fef8
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	656	$ 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	657	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	658	bookmark 'multipledelete1' deleted
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	659	bookmark 'multipledelete2' deleted
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	660	$ hg id -ir e46a4836065c
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	661	abort: unknown revision 'e46a4836065c'!
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	662	[255]
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	663	$ hg id -ir b4594d867745
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	664	abort: unknown revision 'b4594d867745'!
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	665	[255]
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	666	$ 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	667	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	668	bookmark 'singlenode1' deleted
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	669	bookmark 'singlenode2' deleted
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	670	$ hg id -ir 43227190fef8
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	671	abort: unknown revision '43227190fef8'!
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	672	[255]
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	673	$ hg strip -B unknownbookmark
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	674	abort: bookmark 'unknownbookmark' not found
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	675	[255]
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	676	$ 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	677	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	678	[255]
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	679	$ 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	680	abort: bookmark 'unknownbookmark' not found
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	681	[255]
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	682	$ hg strip -B delete
21847 f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	683	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	684	bookmark 'delete' deleted
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	685	$ hg id -ir 6:2702dd0c91e7
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	686	abort: unknown revision '2702dd0c91e7'!
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	687	[255]
21847 f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	688	$ hg update B
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	689	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	690	(activating bookmark B)
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	691	$ echo a > a
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	692	$ hg add a
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	693	$ hg strip -B B
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	694	abort: local changes found
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	695	[255]
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	696	$ hg bookmarks
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	697	* B 6:ff43616e5d0f
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16829 diff changeset	698
21854 ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	699	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	700
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	701	$ hg strip -b tip
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	702	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	703	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	704
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	705	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	706
29974 7109d5ddeb0c help: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29954 diff changeset	707	(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	708
22117 c1d93edcf004 help: fold repeatable option message into option table header Matt Mackall <mpm@selenic.com> parents: 22112 diff changeset	709	options ([+] can be repeated):
21854 ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	710
27030 cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	711	-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	712	revisions without this option)
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	713	-f --force force removal of changesets, discard uncommitted
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	714	changes (no backup)
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	715	--no-backup no backups
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	716	-k --keep do not modify working directory during strip
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	717	-B --bookmark VALUE [+] remove revs only reachable from given bookmark
cf9ed6d32ccb strip: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 26929 diff changeset	718	--mq operate on patch repository
21854 ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	719
29974 7109d5ddeb0c help: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29954 diff changeset	720	(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	721	[255]
23835 aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	722
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	723	$ cd ..
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	724
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	725	Verify bundles don't get overwritten:
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	$ hg init doublebundle
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	728	$ cd doublebundle
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	729	$ touch a
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	730	$ hg commit -Aqm a
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	731	$ touch b
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	732	$ hg commit -Aqm b
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	733	$ hg strip -r 0
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	734	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	735	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	736	$ ls .hg/strip-backup
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	737	3903775176ed-e68910bd-backup.hg
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	738	$ 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	739	$ hg strip -r 0
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	740	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	741	$ ls .hg/strip-backup
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	742	3903775176ed-54390173-backup.hg
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	743	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	744	$ cd ..
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	745
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	746	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	747	------------------------------------------------------------
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	748
26173 0f14c40a05c4 test-strip: fix spelling of initialization (en-US) timeless@mozdev.org parents: 26012 diff changeset	749	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	750
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	751	$ hg init issue4736
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	752	$ cd issue4736
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	753	$ echo a > a
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	754	$ hg add a
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	755	$ 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	756	$ echo b > b
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	757	$ hg add b
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	758	$ 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	759	$ echo c > c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	760	$ hg add c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	761	$ 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	762	$ 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	763	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	764	$ echo d > d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	765	$ hg add d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	766	$ 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	767	created new head
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	768	$ 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	769	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	770	$ 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	771	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	772	(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	773	$ 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	774	$ hg log -G
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	775	@ changeset: 4:d8db9d137221
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	776	\|\ tag: tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	777	\| \| parent: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	778	\| \| parent: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	779	\| \| user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	780	\| \| 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	781	\| \| summary: mergeCD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	782	\| \|
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	783	\| 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	784	\| \| parent: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	785	\| \| user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	786	\| \| 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	787	\| \| summary: commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	788	\| \|
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	789	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	790	\|/ user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	791	\| 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	792	\| summary: commitC
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	793	\|
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	794	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	795	\| user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	796	\| 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	797	\| summary: commitB
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	798	\|
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	799	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	800	user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	801	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	802	summary: commitA
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	803
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	804
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	805	Check bundle behavior:
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	806
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	807	$ 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	808	2 changesets found
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	809	$ 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	810	changeset: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	811	parent: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	812	user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	813	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	814	summary: commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	815
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	816	changeset: 4:d8db9d137221
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	817	tag: tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	818	parent: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	819	parent: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	820	user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	821	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	822	summary: mergeCD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	823
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	824
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	825	check strip behavior
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	826
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	827	$ 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	828	resolving manifests
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	829	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	830	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	831	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	832	removing c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	833	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	834	removing d
28318 564a354f7f35 tests: flag Windows specific lines about background closing as optional Matt Harbison <matt_harbison@yahoo.com> parents: 28029 diff changeset	835	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	836	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	837	2 changesets found
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	838	list of changesets:
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	839	6625a516847449b6f0fa3737b9ba56e9f0f3032c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	840	d8db9d1372214336d2b5570f20ee468d2c72fa8b
26929 e8e78a3d94b1 test: use generaldelta in 'test-strip.t' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26736 diff changeset	841	bundle2-output-bundle: "HG20", (1 params) 1 parts total
29593 953839de96ab bundle2: store changeset count when creating file bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 29592 diff changeset	842	bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
25677 af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	843	saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg (glob)
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	844	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	845	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	846	$ hg log -G
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	847	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	848	\| tag: tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	849	\| user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	850	\| 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	851	\| summary: commitC
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	852	\|
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	853	@ changeset: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	854	\| user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	855	\| 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	856	\| summary: commitB
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	857	\|
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	858	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	859	user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	860	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	861	summary: commitA
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	862
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	strip backup content
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	865
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	866	$ 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	867	changeset: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	868	parent: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	869	user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	870	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	871	summary: commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	872
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	873	changeset: 4:d8db9d137221
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	874	tag: tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	875	parent: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	876	parent: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	877	user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	878	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	879	summary: mergeCD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24709 diff changeset	880
29196 bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	881	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	882
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	883	$ cat > ../stripstalephasecache.py << EOF
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	884	> from mercurial import extensions, localrepo
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	885	> 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	886	> def test(transaction):
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	887	> # observe cache inconsistency
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	888	> try:
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	889	> [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	890	> except IndexError:
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	891	> repo.ui.status("Index error!\n")
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	892	> transaction = orig(repo, desc, args, *kwargs)
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	893	> # warm up the phase cache
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	894	> list(repo.revs("not public()"))
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	895	> if desc != 'strip':
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	896	> transaction.addpostclose("phase invalidation test", test)
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	897	> return transaction
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	898	> def extsetup(ui):
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	899	> extensions.wrapfunction(localrepo.localrepository, "transaction",
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	900	> transactioncallback)
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	901	> EOF
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	902	$ hg up -C 2
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	903	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	904	$ echo k > k
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	905	$ hg add k
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	906	$ hg commit -m commitK
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	907	$ echo l > l
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	908	$ hg add l
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	909	$ hg commit -m commitL
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	910	$ hg book -r tip blah
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	911	$ 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	912	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	913	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	914	$ hg up -C 1
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235) Laurent Charignon <lcharignon@fb.com> parents: 28324 diff changeset	915	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	916
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	917	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	918	(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	919
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	920	$ 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	921	> 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	922	> 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	923	> 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	924	> def transaction(self, desc, args, *kwargs):
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	925	> tr = super(crashstriprepo, self).transaction(self, desc, args, *kwargs)
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	926	> 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	927	> 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	928	> 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	929	> return tr
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	930	> 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	931	> EOF
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	932	$ 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	933	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	934	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	935	abort: boom
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	936	[255]
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	937
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping Pierre-Yves David <pierre-yves.david@fb.com> parents: 25695 diff changeset	938

author	timeless <timeless@mozdev.org>
	Tue, 20 Sep 2016 23:47:46 +0000
changeset 29974	7109d5ddeb0c
parent 29954	769aee32fae0
child 30024	f3c4edfd35e1
permissions	-rw-r--r--