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

11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	1	$ 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	2	$ echo "strip=" >> $HGRCPATH
8452 cb93eee1fbcd tests: add missing interpreter lines Martin Geisler <mg@lazybytes.net> parents: 6635 diff changeset	3
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	4	$ restore() {
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	5	> hg unbundle -q .hg/strip-backup/*
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	6	> rm .hg/strip-backup/*
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	7	> }
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	8	$ teststrip() {
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	9	> hg up -C $1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	10	> echo % before update $1, strip $2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	11	> hg parents
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	12	> hg --traceback strip $2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	13	> echo % after update $1, strip $2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	14	> hg parents
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	15	> restore
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	16	> }
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	17
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	18	$ hg init test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	19	$ cd test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	20
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	21	$ echo foo > bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	22	$ hg ci -Ama
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	23	adding bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	24
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	25	$ echo more >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	26	$ hg ci -Amb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	27
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	28	$ echo blah >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	29	$ hg ci -Amc
11200 12e5149cafca strip: improve full backup message Matt Mackall <mpm@selenic.com> parents: 8452 diff changeset	30
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	31	$ hg up 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	32	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	33	$ echo blah >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	34	$ hg ci -Amd
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	35	created new head
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	36
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	37	$ echo final >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	38	$ hg ci -Ame
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	39
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	40	$ hg log
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	41	changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	42	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	43	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	44	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	45	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	46
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	47	changeset: 3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	48	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	49	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	50	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	51	summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	52
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	53	changeset: 2:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	54	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	55	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	56	summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	57
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	58	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	59	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	60	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	61	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	62
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	63	changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	64	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	65	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	66	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	67
6635 d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	68
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	69	$ teststrip 4 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	70	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	71	% before update 4, strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	72	changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	73	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	74	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	75	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	76	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	77
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	78	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	79	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	80	% after update 4, strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	81	changeset: 3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	82	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	83	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	84	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	85	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	86	summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	87
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	88	$ teststrip 4 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	89	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	90	% before update 4, strip 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	91	changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	92	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	93	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	94	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	95	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	96
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	97	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	98	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	99	% after update 4, strip 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	100	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	101	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	102	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	103	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	104
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	105	$ teststrip 1 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	106	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	107	% before update 1, strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	108	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	109	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	110	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	111	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	112
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	113	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	114	% after update 1, strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	115	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	116	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	117	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	118	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	119
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	120	$ teststrip 4 2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	121	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	122	% before update 4, strip 2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	123	changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	124	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	125	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	126	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	127	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	128
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	129	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	130	% after update 4, strip 2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	131	changeset: 3:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	132	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	133	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	134	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	135	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	136
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	137	$ teststrip 4 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	138	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	139	% before update 4, strip 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	140	changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	141	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	142	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	143	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	144	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	145	summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	146
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	147	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	148	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	149	% after update 4, strip 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	150	changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	151	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	152	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	153	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	154	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	155
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	156	$ teststrip null 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	157	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	158	% before update null, strip 4
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	159	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	160	% 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	161
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	162	$ hg log
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	163	changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	164	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	165	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	166	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	167	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	168	summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	169
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	170	changeset: 3:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	171	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	172	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	173	summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	174
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	175	changeset: 2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	176	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	177	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	178	summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	179
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	180	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	181	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	182	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	183	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	184
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	185	changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	186	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	187	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	188	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	189
23898 b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	190	$ hg up -C 4
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	191	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	192	$ hg parents
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	193	changeset: 4:264128213d29
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	194	tag: tip
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	195	parent: 1:ef3a871183d7
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	196	user: test
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	197	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	198	summary: c
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	199
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	200	$ hg --config experimental.bundle2-exp=True --config experimental.strip-bundle2-version=02 --traceback strip 4
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	201	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	202	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	203	$ hg parents
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	204	changeset: 1:ef3a871183d7
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	205	user: test
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	206	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	207	summary: b
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	208
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	209	$ hg debugbundle .hg/strip-backup/*
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	210	Stream params: {}
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	211	b2x:changegroup -- "{'version': '02'}"
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	212	264128213d290d868c54642d13aeaa3675551a78
b21c2e0ee8a3 repair: add experimental option to write bundle2 files Eric Sumner <ericsumner@fb.com> parents: 23835 diff changeset	213	$ restore
6635 d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	214
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	215	$ hg up -C 2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	216	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	217	$ hg merge 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	218	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	219	(branch merge, don't forget to commit)
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	220
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	221	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	222
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	223	$ hg parents
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	224	changeset: 2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	225	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	226	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	227	summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	228
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	229	changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	230	tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	231	parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	232	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	233	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	234	summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	235
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	236	$ hg strip 4
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	237	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	238	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	239
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	240	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	241
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	242	$ hg parents
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	243	changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	244	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	245	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	246	summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	247
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	248	$ restore
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	249
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	250	$ hg up
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	251	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19951 diff changeset	252	$ hg log -G
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	253	@ changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	254	\| tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	255	\| parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	256	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	257	\| 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	258	\| summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	259	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	260	\| o changeset: 3:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	261	\| \| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	262	\| \| 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	263	\| \| summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	264	\| \|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	265	\| o changeset: 2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	266	\|/ user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	267	\| date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	268	\| summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	269	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	270	o changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	271	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	272	\| 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	273	\| summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	274	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	275	o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	276	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	277	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	278	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	279
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	280
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	281	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	282
12767 c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	283	$ hg strip "roots(2)" 3
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	284	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	285	$ hg log -G
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	286	@ changeset: 2:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	287	\| tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	288	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	289	\| 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	290	\| summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	291	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	292	o changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	293	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	294	\| 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	295	\| summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	296	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	297	o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	298	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	299	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	300	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	301
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	302	$ restore
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19951 diff changeset	303	$ hg log -G
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	304	o changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	305	\| tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	306	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	307	\| 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	308	\| summary: e
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	309	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	310	o changeset: 3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	311	\| parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	312	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	313	\| 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	314	\| summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	315	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	316	\| @ changeset: 2:264128213d29
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	317	\|/ user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	318	\| 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	319	\| summary: c
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	320	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	321	o changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	322	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	323	\| 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	324	\| summary: b
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	325	\|
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	326	o changeset: 0:9ab35a2d17cb
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: a
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
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	332	2 different branches: 2 strips
11789 e2bce1c717fa strip: support multiple revisions Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11637 diff changeset	333
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	334	$ hg strip 2 4
18371 ff2c89ebf5d4 mq: stabilize update after strip of parent revision Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	335	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	336	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	337	$ hg log -G
18371 ff2c89ebf5d4 mq: stabilize update after strip of parent revision Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	338	o changeset: 2:65bd5f99a4a3
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	339	\| tag: tip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	340	\| user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	341	\| 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	342	\| summary: d
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	343	\|
18371 ff2c89ebf5d4 mq: stabilize update after strip of parent revision Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	344	@ changeset: 1:ef3a871183d7
11906 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: b
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: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	350	user: test
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	351	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	352	summary: a
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	353
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	354	$ restore
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	355
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	356	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	357
12767 c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	358	$ hg strip 1 "2\|4"
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	359	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	360	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	361	$ restore
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	362
20885 f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	363	verify fncache is kept up-to-date
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	364
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	365	$ touch a
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	366	$ hg ci -qAm a
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	367	$ cat .hg/store/fncache \| sort
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	368	data/a.i
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	369	data/bar.i
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	370	$ hg strip tip
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	371	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	372	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	373	$ cat .hg/store/fncache
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	374	data/bar.i
f49d60fa40a5 fncache: clean up fncache during strips Durham Goode <durham@fb.com> parents: 20117 diff changeset	375
12767 c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	376	stripping an empty revset
c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	377
c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	378	$ hg strip "1 and not 1"
c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	379	abort: empty revision set
c3316b6a3219 strip: support revision sets Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12682 diff changeset	380	[255]
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	381
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	382	remove branchy history for qimport tests
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	383
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	384	$ hg strip 3
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	385	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	386
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	387
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	388	strip of applied mq should cleanup status file
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	389
19827 8b9c73ddeec1 strip: rename test-mq-strip into test-strip Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19090 diff changeset	390	$ echo "mq=" >> $HGRCPATH
11906 1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	391	$ hg up -C 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	392	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	393	$ echo fooagain >> bar
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	394	$ hg ci -mf
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	395	$ hg qimport -r tip:2
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	396
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	397	applied patches before strip
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	398
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	399	$ hg qapplied
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	400	2.diff
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	401	3.diff
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	402	4.diff
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	403
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	404	stripping revision in queue
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	405
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	406	$ hg strip 3
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	407	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	408	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	409
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	410	applied patches after stripping rev in queue
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	$ hg qapplied
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	413	2.diff
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	414
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	415	stripping ancestor of queue
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	416
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	417	$ hg strip 1
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	418	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	419	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	420
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	421	applied patches after stripping ancestor of queue
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	422
1219d019339d tests: unify test-mq-strip Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11789 diff changeset	423	$ hg qapplied
12682 58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	424
19951 d51c4d85ec23 spelling: random spell checker fixes Mads Kiilerich <madski@unity3d.com> parents: 19827 diff changeset	425	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	426
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	427	$ echo b > b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	428	$ hg add b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	429	$ hg ci -m 'b'
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	430	$ hg log --graph
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	431	@ changeset: 1:7519abd79d14
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	432	\| tag: tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	433	\| user: test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	434	\| 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	435	\| summary: b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	436	\|
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	437	o changeset: 0:9ab35a2d17cb
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	438	user: test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	439	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	440	summary: a
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	441
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	442
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	443	$ echo c > b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	444	$ echo c > bar
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	445	$ hg strip tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	446	abort: local changes found
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	447	[255]
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	448	$ hg strip tip --keep
13572 1bb2a56a9d73 tests: use $TESTTMP more and use (glob) less Martin Geisler <mg@aragost.com> parents: 12767 diff changeset	449	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	450	$ hg log --graph
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	451	@ changeset: 0:9ab35a2d17cb
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	452	tag: tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	453	user: test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	454	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	455	summary: a
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	456
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	457	$ hg status
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	458	M bar
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip Augie Fackler <durin42@gmail.com> parents: 12640 diff changeset	459	? b
18760 e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	460
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	461	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	462
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	463	$ touch b
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	464	$ hg add b
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	465	$ hg commit -mb
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	466	$ 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	467
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	468	... 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	469
18760 e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	470	$ hg add c
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	471	$ hg rm bar
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	472	$ 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	473	$ 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	474	$ 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	475	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	476	$ 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	477	! 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	478	? 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	479
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	480	... 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	481
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir Siddharth Agarwal <sid0@fb.com> parents: 18760 diff changeset	482	$ 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	483	$ 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	484	$ 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	485	$ hg status
18760 e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	486	$ echo b > b
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	487	$ echo d > d
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	488	$ hg strip --keep tip
23835 aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	489	saved backup bundle to $TESTTMP/test/.hg/strip-backup/57e364c8a475-4cfed93c-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	490	$ hg status
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	491	M b
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	492	! bar
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	493	? c
e74704c33e24 strip: make --keep option not set all dirstate times to 0 Durham Goode <durham@fb.com> parents: 18371 diff changeset	494	? d
16252 cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	495	$ cd ..
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	496
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	497	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	498
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	499	$ 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	500	$ cd issue3299
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13572 diff changeset	501	$ 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	502	$ 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	503	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	504
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	505	test hg strip -B bookmark
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	506
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	507	$ cd ..
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	508	$ hg init bookmarks
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	509	$ cd bookmarks
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	510	$ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b'
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	511	$ hg bookmark -r 'a' 'todelete'
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	512	$ hg bookmark -r 'b' 'B'
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	513	$ hg bookmark -r 'b' 'nostrip'
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	514	$ hg bookmark -r 'c' 'delete'
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	515	$ hg up -C todelete
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	516	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	517	(activating bookmark todelete)
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	518	$ hg strip -B nostrip
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	519	bookmark 'nostrip' deleted
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	520	abort: empty revision set
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	521	[255]
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	522	$ hg strip -B todelete
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	523	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	524	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	525	bookmark 'todelete' deleted
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	526	$ hg id -ir dcbb326fdec2
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	527	abort: unknown revision 'dcbb326fdec2'!
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	528	[255]
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	529	$ hg id -ir d62d843c9a01
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	530	d62d843c9a01
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	531	$ hg bookmarks
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	532	B 9:ff43616e5d0f
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	533	delete 6:2702dd0c91e7
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	534	$ hg strip -B delete
21847 f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	535	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	536	bookmark 'delete' deleted
16718 3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	537	$ hg id -ir 6:2702dd0c91e7
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	538	abort: unknown revision '2702dd0c91e7'!
3290e24bb3f0 strip: introduce -B option to remove a bookmark David Soria Parra <dsp@php.net> parents: 16252 diff changeset	539	[255]
21847 f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	540	$ hg update B
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	541	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	542	(activating bookmark B)
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	543	$ echo a > a
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	544	$ hg add a
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	545	$ hg strip -B B
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	546	abort: local changes found
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	547	[255]
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	548	$ hg bookmarks
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295) David Soria Parra <davidsp@fb.com> parents: 21503 diff changeset	549	* B 6:ff43616e5d0f
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16829 diff changeset	550
21854 ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	551	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	552
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	553	$ hg strip -b tip
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	554	hg strip: option -b not recognized
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	555	hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV...
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	556
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	557	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	558
22112 d968f4741a22 help: normalize extension shadow hint Matt Mackall <mpm@selenic.com> parents: 22111 diff changeset	559	(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	560
22117 c1d93edcf004 help: fold repeatable option message into option table header Matt Mackall <mpm@selenic.com> parents: 22112 diff changeset	561	options ([+] can be repeated):
21854 ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	562
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	563	-r --rev REV [+] strip specified revision (optional, can specify revisions
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	564	without this option)
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	565	-f --force force removal of changesets, discard uncommitted changes
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	566	(no backup)
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	567	--no-backup no backups
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	568	-k --keep do not modify working copy during strip
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	569	-B --bookmark VALUE remove revs only reachable from given bookmark
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	570	--mq operate on patch repository
ba3bc6474bbf strip: drop -b/--backup option (BC) Matt Mackall <mpm@selenic.com> parents: 21847 diff changeset	571
22111 aa5e256839d5 help: improve command summary hint Matt Mackall <mpm@selenic.com> parents: 21854 diff changeset	572	(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	573	[255]
23835 aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	574
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	575	$ cd ..
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	576
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	577	Verify bundles don't get overwritten:
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	578
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	579	$ hg init doublebundle
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	580	$ cd doublebundle
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	581	$ touch a
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	582	$ hg commit -Aqm a
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	583	$ touch b
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	584	$ hg commit -Aqm b
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	585	$ hg strip -r 0
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	586	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	587	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	588	$ ls .hg/strip-backup
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	589	3903775176ed-e68910bd-backup.hg
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	590	$ 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	591	$ hg strip -r 0
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	592	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	593	$ ls .hg/strip-backup
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	594	3903775176ed-54390173-backup.hg
aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 22117 diff changeset	595	3903775176ed-e68910bd-backup.hg

author	Eric Sumner <ericsumner@fb.com>
	Thu, 15 Jan 2015 16:51:13 -0800
changeset 23898	b21c2e0ee8a3
parent 23835	aa4a1672583e
child 23939	33d1b81c6ef0
permissions	-rw-r--r--