Mercurial > hg
annotate tests/test-strip.t @ 24814:60e4258b2052 stable
help: fix typo commited -> committed
author | Javi Merino <merino.jav@gmail.com> |
---|---|
date | Sun, 19 Apr 2015 11:37:29 +0100 |
parents | 69154e0ae384 |
children | 1ef96a3b8b89 af5b2f4ed594 |
rev | line source |
---|---|
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 |
23939
33d1b81c6ef0
repair._bundle: fix traceback for bad config value
Eric Sumner <ericsumner@fb.com>
parents:
23898
diff
changeset
|
200 $ hg --config experimental.bundle2-exp=True --config experimental.strip-bundle2-version=INVALID strip 4 |
33d1b81c6ef0
repair._bundle: fix traceback for bad config value
Eric Sumner <ericsumner@fb.com>
parents:
23898
diff
changeset
|
201 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
33d1b81c6ef0
repair._bundle: fix traceback for bad config value
Eric Sumner <ericsumner@fb.com>
parents:
23898
diff
changeset
|
202 unknown strip-bundle2-version value 'INVALID'; should be one of ['01', '02'] |
33d1b81c6ef0
repair._bundle: fix traceback for bad config value
Eric Sumner <ericsumner@fb.com>
parents:
23898
diff
changeset
|
203 saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob) |
33d1b81c6ef0
repair._bundle: fix traceback for bad config value
Eric Sumner <ericsumner@fb.com>
parents:
23898
diff
changeset
|
204 $ hg debugbundle .hg/strip-backup/* |
33d1b81c6ef0
repair._bundle: fix traceback for bad config value
Eric Sumner <ericsumner@fb.com>
parents:
23898
diff
changeset
|
205 264128213d290d868c54642d13aeaa3675551a78 |
33d1b81c6ef0
repair._bundle: fix traceback for bad config value
Eric Sumner <ericsumner@fb.com>
parents:
23898
diff
changeset
|
206 $ restore |
33d1b81c6ef0
repair._bundle: fix traceback for bad config value
Eric Sumner <ericsumner@fb.com>
parents:
23898
diff
changeset
|
207 |
33d1b81c6ef0
repair._bundle: fix traceback for bad config value
Eric Sumner <ericsumner@fb.com>
parents:
23898
diff
changeset
|
208 $ hg up -C 4 |
33d1b81c6ef0
repair._bundle: fix traceback for bad config value
Eric Sumner <ericsumner@fb.com>
parents:
23898
diff
changeset
|
209 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
23898
b21c2e0ee8a3
repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents:
23835
diff
changeset
|
210 $ 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
|
211 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
|
212 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
|
213 $ hg parents |
b21c2e0ee8a3
repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents:
23835
diff
changeset
|
214 changeset: 1:ef3a871183d7 |
b21c2e0ee8a3
repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents:
23835
diff
changeset
|
215 user: test |
b21c2e0ee8a3
repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents:
23835
diff
changeset
|
216 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
|
217 summary: b |
b21c2e0ee8a3
repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents:
23835
diff
changeset
|
218 |
b21c2e0ee8a3
repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents:
23835
diff
changeset
|
219 $ hg debugbundle .hg/strip-backup/* |
b21c2e0ee8a3
repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents:
23835
diff
changeset
|
220 Stream params: {} |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24364
diff
changeset
|
221 changegroup -- "{'version': '02'}" |
23898
b21c2e0ee8a3
repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents:
23835
diff
changeset
|
222 264128213d290d868c54642d13aeaa3675551a78 |
24073
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
223 $ hg incoming .hg/strip-backup/* |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
224 comparing with .hg/strip-backup/264128213d29-0b39d6bf-backup.hg |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
225 searching for changes |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
226 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 |
23898
b21c2e0ee8a3
repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents:
23835
diff
changeset
|
233 $ restore |
24073
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
234 $ hg up -C 4 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
235 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
236 $ hg --config experimental.bundle2-exp=True --config experimental.strip-bundle2-version=02 --traceback strip 4 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
237 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
238 saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob) |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
239 $ hg parents |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
240 changeset: 1:ef3a871183d7 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
241 user: test |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
242 date: Thu Jan 01 00:00:00 1970 +0000 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
243 summary: b |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
244 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
245 $ hg debugbundle .hg/strip-backup/* |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
246 Stream params: {} |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24364
diff
changeset
|
247 changegroup -- "{'version': '02'}" |
24073
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
248 264128213d290d868c54642d13aeaa3675551a78 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
249 $ hg pull .hg/strip-backup/* |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
250 pulling from .hg/strip-backup/264128213d29-0b39d6bf-backup.hg |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
251 searching for changes |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
252 adding changesets |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
253 adding manifests |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
254 adding file changes |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
255 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
|
256 (run 'hg heads' to see heads, 'hg merge' to merge) |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
257 $ rm .hg/strip-backup/* |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
258 $ hg log --graph |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
259 o changeset: 4:264128213d29 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
260 | tag: tip |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
261 | parent: 1:ef3a871183d7 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
262 | user: test |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
263 | date: Thu Jan 01 00:00:00 1970 +0000 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
264 | summary: c |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
265 | |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
266 | o changeset: 3:443431ffac4f |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
267 | | user: test |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
268 | | date: Thu Jan 01 00:00:00 1970 +0000 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
269 | | summary: e |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
270 | | |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
271 | o changeset: 2:65bd5f99a4a3 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
272 |/ user: test |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
273 | date: Thu Jan 01 00:00:00 1970 +0000 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
274 | summary: d |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
275 | |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
276 @ changeset: 1:ef3a871183d7 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
277 | user: test |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
278 | date: Thu Jan 01 00:00:00 1970 +0000 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
279 | summary: b |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
280 | |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
281 o changeset: 0:9ab35a2d17cb |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
282 user: test |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
283 date: Thu Jan 01 00:00:00 1970 +0000 |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
284 summary: a |
ff5caa8dfd99
bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents:
23939
diff
changeset
|
285 |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
286 $ hg up -C 2 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
287 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
|
288 $ hg merge 4 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
289 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
|
290 (branch merge, don't forget to commit) |
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 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
|
293 |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
294 $ hg parents |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
295 changeset: 2:65bd5f99a4a3 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
296 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
297 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
|
298 summary: d |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
299 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
300 changeset: 4:264128213d29 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
301 tag: tip |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
302 parent: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
303 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
304 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
|
305 summary: c |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
306 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
307 $ hg strip 4 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
308 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
|
309 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
|
310 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
311 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
|
312 |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
313 $ hg parents |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
314 changeset: 1:ef3a871183d7 |
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: b |
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 $ restore |
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 $ hg up |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
322 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
|
323 $ hg log -G |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
324 @ changeset: 4:264128213d29 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
325 | tag: tip |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
326 | parent: 1:ef3a871183d7 |
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: 3:443431ffac4f |
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: e |
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: 2:65bd5f99a4a3 |
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: d |
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 o changeset: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
342 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
343 | 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
|
344 | summary: b |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
345 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
346 o changeset: 0:9ab35a2d17cb |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
347 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
348 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
|
349 summary: a |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
350 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
351 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
352 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
|
353 |
12767
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
354 $ hg strip "roots(2)" 3 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12376
diff
changeset
|
355 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
|
356 $ hg log -G |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
357 @ changeset: 2:264128213d29 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
358 | tag: tip |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
359 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
360 | 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
|
361 | summary: c |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
362 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
363 o changeset: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
364 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
365 | 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
|
366 | summary: b |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
367 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
368 o changeset: 0:9ab35a2d17cb |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
369 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
370 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
|
371 summary: a |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
372 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
373 $ restore |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
19951
diff
changeset
|
374 $ hg log -G |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
375 o changeset: 4:443431ffac4f |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
376 | tag: tip |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
377 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
378 | 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
|
379 | summary: e |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
380 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
381 o changeset: 3:65bd5f99a4a3 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
382 | parent: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
383 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
384 | 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
|
385 | summary: d |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
386 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
387 | @ changeset: 2:264128213d29 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
388 |/ user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
389 | 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
|
390 | summary: c |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
391 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
392 o changeset: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
393 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
394 | 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
|
395 | summary: b |
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 o changeset: 0:9ab35a2d17cb |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
398 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
399 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
|
400 summary: a |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
401 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
402 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
403 2 different branches: 2 strips |
11789
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
404 |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
405 $ hg strip 2 4 |
18371
ff2c89ebf5d4
mq: stabilize update after strip of parent revision
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
406 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
|
407 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
|
408 $ hg log -G |
18371
ff2c89ebf5d4
mq: stabilize update after strip of parent revision
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
409 o changeset: 2:65bd5f99a4a3 |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
410 | tag: tip |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
411 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
412 | 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
|
413 | summary: d |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
414 | |
18371
ff2c89ebf5d4
mq: stabilize update after strip of parent revision
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
415 @ changeset: 1:ef3a871183d7 |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
416 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
417 | 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
|
418 | summary: b |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
419 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
420 o changeset: 0:9ab35a2d17cb |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
421 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
422 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
|
423 summary: a |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
424 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
425 $ restore |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
426 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
427 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
|
428 |
12767
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
429 $ hg strip 1 "2|4" |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
430 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
|
431 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
|
432 $ restore |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
433 |
20885
f49d60fa40a5
fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents:
20117
diff
changeset
|
434 verify fncache is kept up-to-date |
f49d60fa40a5
fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents:
20117
diff
changeset
|
435 |
f49d60fa40a5
fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents:
20117
diff
changeset
|
436 $ touch a |
f49d60fa40a5
fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents:
20117
diff
changeset
|
437 $ hg ci -qAm a |
f49d60fa40a5
fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents:
20117
diff
changeset
|
438 $ cat .hg/store/fncache | sort |
f49d60fa40a5
fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents:
20117
diff
changeset
|
439 data/a.i |
f49d60fa40a5
fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents:
20117
diff
changeset
|
440 data/bar.i |
f49d60fa40a5
fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents:
20117
diff
changeset
|
441 $ hg strip tip |
f49d60fa40a5
fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents:
20117
diff
changeset
|
442 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
|
443 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
|
444 $ cat .hg/store/fncache |
f49d60fa40a5
fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents:
20117
diff
changeset
|
445 data/bar.i |
f49d60fa40a5
fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents:
20117
diff
changeset
|
446 |
12767
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
447 stripping an empty revset |
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
448 |
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
449 $ hg strip "1 and not 1" |
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
450 abort: empty revision set |
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
451 [255] |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
452 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
453 remove branchy history for qimport tests |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
454 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
455 $ hg strip 3 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12376
diff
changeset
|
456 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
|
457 |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
458 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
459 strip of applied mq should cleanup status file |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
460 |
19827
8b9c73ddeec1
strip: rename test-mq-strip into test-strip
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
19090
diff
changeset
|
461 $ echo "mq=" >> $HGRCPATH |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
462 $ hg up -C 3 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
463 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
|
464 $ echo fooagain >> bar |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
465 $ hg ci -mf |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
466 $ hg qimport -r tip:2 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
467 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
468 applied patches before strip |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
469 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
470 $ hg qapplied |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
471 2.diff |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
472 3.diff |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
473 4.diff |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
474 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
475 stripping revision in queue |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
476 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
477 $ hg strip 3 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
478 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
|
479 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
|
480 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
481 applied patches after stripping rev in queue |
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 $ hg qapplied |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
484 2.diff |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
485 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
486 stripping ancestor of queue |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
487 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
488 $ hg strip 1 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
489 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
|
490 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
|
491 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
492 applied patches after stripping ancestor of queue |
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 $ hg qapplied |
12682
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
495 |
19951
d51c4d85ec23
spelling: random spell checker fixes
Mads Kiilerich <madski@unity3d.com>
parents:
19827
diff
changeset
|
496 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
|
497 |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
498 $ echo b > b |
24709
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
499 $ echo bb > bar |
12682
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
500 $ hg add b |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
501 $ hg ci -m 'b' |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
502 $ hg log --graph |
24709
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
503 @ changeset: 1:76dcf9fab855 |
12682
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
504 | tag: tip |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
505 | user: test |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
506 | 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
|
507 | summary: b |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
508 | |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
509 o changeset: 0:9ab35a2d17cb |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
510 user: test |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
511 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
|
512 summary: a |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
513 |
24709
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
514 $ hg up 0 |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
515 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
|
516 $ echo c > bar |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
517 $ hg up -t false |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
518 merging bar |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
519 merging bar failed! |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
520 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
|
521 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
|
522 [1] |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
523 $ hg sum |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
524 parent: 1:76dcf9fab855 tip |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
525 b |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
526 branch: default |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
527 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
|
528 update: (current) |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
529 mq: 3 unapplied |
12682
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
530 |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
531 $ echo c > b |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
532 $ hg strip tip |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
533 abort: local changes found |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
534 [255] |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
535 $ hg strip tip --keep |
13572
1bb2a56a9d73
tests: use $TESTTMP more and use (glob) less
Martin Geisler <mg@aragost.com>
parents:
12767
diff
changeset
|
536 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
|
537 $ hg log --graph |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
538 @ changeset: 0:9ab35a2d17cb |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
539 tag: tip |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
540 user: test |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
541 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
|
542 summary: a |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
543 |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
544 $ hg status |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
545 M bar |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
546 ? b |
24709
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
547 ? bar.orig |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
548 |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
549 $ rm bar.orig |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
550 $ hg sum |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
551 parent: 0:9ab35a2d17cb tip |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
552 a |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
553 branch: default |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
554 commit: 1 modified, 1 unknown |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
555 update: (current) |
69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents:
24686
diff
changeset
|
556 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
|
557 |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
558 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
|
559 |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
560 $ touch b |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
561 $ hg add b |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
562 $ hg commit -mb |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
563 $ 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
|
564 |
ff01506c6852
test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents:
18760
diff
changeset
|
565 ... 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
|
566 |
18760
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
567 $ hg add c |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
568 $ hg rm bar |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
569 $ 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
|
570 $ 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
|
571 $ 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
|
572 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
|
573 $ 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
|
574 ! 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
|
575 ? 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
|
576 |
ff01506c6852
test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents:
18760
diff
changeset
|
577 ... 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
|
578 |
ff01506c6852
test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents:
18760
diff
changeset
|
579 $ 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
|
580 $ 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
|
581 $ 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
|
582 $ hg status |
18760
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
583 $ echo b > b |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
584 $ echo d > d |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
585 $ hg strip --keep tip |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
586 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
|
587 $ hg status |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
588 M b |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
589 ! bar |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
590 ? c |
e74704c33e24
strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents:
18371
diff
changeset
|
591 ? d |
16252
cf17e76be4dd
strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
13572
diff
changeset
|
592 $ cd .. |
cf17e76be4dd
strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
13572
diff
changeset
|
593 |
cf17e76be4dd
strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
13572
diff
changeset
|
594 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
|
595 |
cf17e76be4dd
strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
13572
diff
changeset
|
596 $ 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
|
597 $ cd issue3299 |
cf17e76be4dd
strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
13572
diff
changeset
|
598 $ 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
|
599 $ 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
|
600 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
|
601 |
16718
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
602 test hg strip -B bookmark |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
603 |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
604 $ cd .. |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
605 $ hg init bookmarks |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
606 $ cd bookmarks |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
607 $ 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
|
608 $ hg bookmark -r 'a' 'todelete' |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
609 $ hg bookmark -r 'b' 'B' |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
610 $ hg bookmark -r 'b' 'nostrip' |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
611 $ hg bookmark -r 'c' 'delete' |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
612 $ hg up -C todelete |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
613 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
|
614 (activating bookmark todelete) |
16718
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
615 $ hg strip -B nostrip |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
616 bookmark 'nostrip' deleted |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
617 abort: empty revision set |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
618 [255] |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
619 $ hg strip -B todelete |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
620 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
|
621 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
|
622 bookmark 'todelete' deleted |
16718
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
623 $ hg id -ir dcbb326fdec2 |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
624 abort: unknown revision 'dcbb326fdec2'! |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
625 [255] |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
626 $ hg id -ir d62d843c9a01 |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
627 d62d843c9a01 |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
628 $ hg bookmarks |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
629 B 9:ff43616e5d0f |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
630 delete 6:2702dd0c91e7 |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
631 $ hg strip -B delete |
21847
f6f122f4813b
strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents:
21503
diff
changeset
|
632 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
|
633 bookmark 'delete' deleted |
16718
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
634 $ hg id -ir 6:2702dd0c91e7 |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
635 abort: unknown revision '2702dd0c91e7'! |
3290e24bb3f0
strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents:
16252
diff
changeset
|
636 [255] |
21847
f6f122f4813b
strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents:
21503
diff
changeset
|
637 $ hg update B |
f6f122f4813b
strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents:
21503
diff
changeset
|
638 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
|
639 (activating bookmark B) |
f6f122f4813b
strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents:
21503
diff
changeset
|
640 $ echo a > a |
f6f122f4813b
strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents:
21503
diff
changeset
|
641 $ hg add a |
f6f122f4813b
strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents:
21503
diff
changeset
|
642 $ hg strip -B B |
f6f122f4813b
strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents:
21503
diff
changeset
|
643 abort: local changes found |
f6f122f4813b
strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents:
21503
diff
changeset
|
644 [255] |
f6f122f4813b
strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents:
21503
diff
changeset
|
645 $ hg bookmarks |
f6f122f4813b
strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents:
21503
diff
changeset
|
646 * B 6:ff43616e5d0f |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16829
diff
changeset
|
647 |
21854
ba3bc6474bbf
strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents:
21847
diff
changeset
|
648 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
|
649 |
ba3bc6474bbf
strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents:
21847
diff
changeset
|
650 $ hg strip -b tip |
ba3bc6474bbf
strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents:
21847
diff
changeset
|
651 hg strip: option -b not recognized |
ba3bc6474bbf
strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents:
21847
diff
changeset
|
652 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
|
653 |
ba3bc6474bbf
strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents:
21847
diff
changeset
|
654 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
|
655 |
22112
d968f4741a22
help: normalize extension shadow hint
Matt Mackall <mpm@selenic.com>
parents:
22111
diff
changeset
|
656 (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
|
657 |
22117
c1d93edcf004
help: fold repeatable option message into option table header
Matt Mackall <mpm@selenic.com>
parents:
22112
diff
changeset
|
658 options ([+] can be repeated): |
21854
ba3bc6474bbf
strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents:
21847
diff
changeset
|
659 |
ba3bc6474bbf
strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents:
21847
diff
changeset
|
660 -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
|
661 without this option) |
ba3bc6474bbf
strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents:
21847
diff
changeset
|
662 -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
|
663 (no backup) |
ba3bc6474bbf
strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents:
21847
diff
changeset
|
664 --no-backup no backups |
24364
135b23868f45
commands: replace "working copy" with "working directory" in help/messages
Yuya Nishihara <yuya@tcha.org>
parents:
24073
diff
changeset
|
665 -k --keep do not modify working directory during strip |
21854
ba3bc6474bbf
strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents:
21847
diff
changeset
|
666 -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
|
667 --mq operate on patch repository |
ba3bc6474bbf
strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents:
21847
diff
changeset
|
668 |
22111
aa5e256839d5
help: improve command summary hint
Matt Mackall <mpm@selenic.com>
parents:
21854
diff
changeset
|
669 (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
|
670 [255] |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
671 |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
672 $ cd .. |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
673 |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
674 Verify bundles don't get overwritten: |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
675 |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
676 $ hg init doublebundle |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
677 $ cd doublebundle |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
678 $ touch a |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
679 $ hg commit -Aqm a |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
680 $ touch b |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
681 $ hg commit -Aqm b |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
682 $ hg strip -r 0 |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
683 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
|
684 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
|
685 $ ls .hg/strip-backup |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
686 3903775176ed-e68910bd-backup.hg |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
687 $ 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
|
688 $ hg strip -r 0 |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
689 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
|
690 $ ls .hg/strip-backup |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
691 3903775176ed-54390173-backup.hg |
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
22117
diff
changeset
|
692 3903775176ed-e68910bd-backup.hg |