annotate tests/test-strip.t @ 26866:0f75461a9698

test: enforce non-general delta in 'test-generaldelta.t' If general delta becomes the default, we need to be explicit about what we want to be tested.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 18 Oct 2015 18:49:59 +0200
parents 143b52fce68e
children e8e78a3d94b1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
26423
c93f91c1db1c strip: use bundle2 + cg2 by default when repository use general delta
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26173
diff changeset
201 $ hg --traceback strip 4
23898
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
202 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
203 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
204 $ hg parents
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
205 changeset: 1:ef3a871183d7
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
206 user: test
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
207 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
208 summary: b
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
209
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
210 $ hg debugbundle .hg/strip-backup/*
26423
c93f91c1db1c strip: use bundle2 + cg2 by default when repository use general delta
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26173
diff changeset
211 264128213d290d868c54642d13aeaa3675551a78
24073
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
212 $ hg pull .hg/strip-backup/*
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
213 pulling from .hg/strip-backup/264128213d29-0b39d6bf-backup.hg
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
214 searching for changes
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
215 adding changesets
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
216 adding manifests
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
217 adding file changes
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
218 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
219 (run 'hg heads' to see heads, 'hg merge' to merge)
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
220 $ rm .hg/strip-backup/*
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
221 $ hg log --graph
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
222 o changeset: 4:264128213d29
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
223 | tag: tip
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
224 | parent: 1:ef3a871183d7
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
225 | user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
226 | date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
227 | summary: c
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
228 |
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
229 | o changeset: 3:443431ffac4f
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
230 | | user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
231 | | date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
232 | | summary: e
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
233 | |
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
234 | o changeset: 2:65bd5f99a4a3
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
235 |/ user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
236 | date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
237 | summary: d
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
238 |
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
239 @ changeset: 1:ef3a871183d7
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
240 | user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
241 | date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
242 | summary: b
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
243 |
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
244 o changeset: 0:9ab35a2d17cb
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
245 user: test
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
246 date: Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
247 summary: a
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
248
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
249 $ hg up -C 2
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
250 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
251 $ hg merge 4
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
252 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
253 (branch merge, don't forget to commit)
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
254
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
255 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
256
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
257 $ hg parents
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
258 changeset: 2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
259 user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
260 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
261 summary: d
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
262
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
263 changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
264 tag: tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
265 parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
266 user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
267 date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
268 summary: c
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
269
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
270 $ hg strip 4
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
271 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
272 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
273
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
274 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
275
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
276 $ hg parents
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
277 changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
278 user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
279 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
280 summary: b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
281
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
282 $ restore
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
283
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
284 $ hg up
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
285 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
286 $ hg log -G
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
287 @ changeset: 4:264128213d29
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
288 | tag: tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
289 | parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
290 | user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
291 | 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
292 | summary: c
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
293 |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
294 | o changeset: 3:443431ffac4f
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
295 | | user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
296 | | date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
297 | | summary: e
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
298 | |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
299 | o changeset: 2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
300 |/ user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
301 | date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
302 | summary: d
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
303 |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
304 o changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
305 | user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
306 | date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
307 | summary: b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
308 |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
309 o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
310 user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
311 date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
312 summary: a
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
313
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
314
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
315 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
316
12767
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
317 $ hg strip "roots(2)" 3
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
318 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
319 $ hg log -G
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
320 @ changeset: 2:264128213d29
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
321 | tag: tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
322 | user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
323 | date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
324 | summary: c
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
325 |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
326 o changeset: 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: b
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: 0:9ab35a2d17cb
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: a
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 $ restore
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19951
diff changeset
337 $ hg log -G
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
338 o changeset: 4:443431ffac4f
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
339 | tag: tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
340 | user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
341 | date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
342 | summary: e
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
343 |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
344 o changeset: 3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
345 | parent: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
346 | user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
347 | 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
348 | summary: d
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
349 |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
350 | @ changeset: 2:264128213d29
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
351 |/ user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
352 | date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
353 | summary: c
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
354 |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
355 o changeset: 1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
356 | user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
357 | date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
358 | summary: b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
359 |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
360 o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
361 user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
362 date: Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
363 summary: a
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
364
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
365
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
366 2 different branches: 2 strips
11789
e2bce1c717fa strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11637
diff changeset
367
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
368 $ hg strip 2 4
18371
ff2c89ebf5d4 mq: stabilize update after strip of parent revision
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
369 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
370 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
371 $ hg log -G
18371
ff2c89ebf5d4 mq: stabilize update after strip of parent revision
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
372 o changeset: 2:65bd5f99a4a3
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
373 | tag: tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
374 | user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
375 | 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
376 | summary: d
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
377 |
18371
ff2c89ebf5d4 mq: stabilize update after strip of parent revision
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
378 @ changeset: 1:ef3a871183d7
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
379 | user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
380 | 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
381 | summary: b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
382 |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
383 o changeset: 0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
384 user: test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
385 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
386 summary: a
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
387
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
388 $ restore
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
389
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
390 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
391
12767
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
392 $ hg strip 1 "2|4"
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
393 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
394 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
395 $ restore
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
396
20885
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
397 verify fncache is kept up-to-date
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
398
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
399 $ touch a
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
400 $ hg ci -qAm a
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
401 $ cat .hg/store/fncache | sort
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
402 data/a.i
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
403 data/bar.i
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
404 $ hg strip tip
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
405 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
406 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
407 $ cat .hg/store/fncache
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
408 data/bar.i
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
409
12767
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
410 stripping an empty revset
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
411
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
412 $ hg strip "1 and not 1"
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
413 abort: empty revision set
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
414 [255]
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
415
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
416 remove branchy history for qimport tests
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
417
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
418 $ hg strip 3
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
419 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11637
64f284da1278 mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents: 11208
diff changeset
420
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
421
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
422 strip of applied mq should cleanup status file
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
423
19827
8b9c73ddeec1 strip: rename test-mq-strip into test-strip
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 19090
diff changeset
424 $ echo "mq=" >> $HGRCPATH
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
425 $ hg up -C 3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
426 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
427 $ echo fooagain >> bar
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
428 $ hg ci -mf
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
429 $ hg qimport -r tip:2
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
430
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
431 applied patches before strip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
432
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
433 $ hg qapplied
26736
143b52fce68e mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents: 26429
diff changeset
434 d
143b52fce68e mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents: 26429
diff changeset
435 e
143b52fce68e mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents: 26429
diff changeset
436 f
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
437
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
438 stripping revision in queue
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
439
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
440 $ hg strip 3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
441 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
442 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
443
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
444 applied patches after stripping rev in queue
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
445
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
446 $ hg qapplied
26736
143b52fce68e mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents: 26429
diff changeset
447 d
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
448
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
449 stripping ancestor of queue
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
450
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
451 $ hg strip 1
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
452 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
453 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
454
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
455 applied patches after stripping ancestor of queue
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
456
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
457 $ hg qapplied
12682
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
458
19951
d51c4d85ec23 spelling: random spell checker fixes
Mads Kiilerich <madski@unity3d.com>
parents: 19827
diff changeset
459 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
460
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
461 $ echo b > b
24709
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
462 $ echo bb > bar
12682
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
463 $ hg add b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
464 $ hg ci -m 'b'
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
465 $ hg log --graph
24709
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
466 @ changeset: 1:76dcf9fab855
12682
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
467 | tag: tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
468 | user: test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
469 | 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
470 | summary: b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
471 |
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
472 o changeset: 0:9ab35a2d17cb
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
473 user: test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
474 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
475 summary: a
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
476
24709
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
477 $ hg up 0
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
478 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
479 $ echo c > bar
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
480 $ hg up -t false
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
481 merging bar
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
482 merging bar failed!
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
483 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
484 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
485 [1]
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
486 $ hg sum
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
487 parent: 1:76dcf9fab855 tip
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
488 b
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
489 branch: default
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
490 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
491 update: (current)
25382
6084926366b9 summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents: 25111
diff changeset
492 phases: 2 draft
24709
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
493 mq: 3 unapplied
12682
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
494
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
495 $ echo c > b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
496 $ hg strip tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
497 abort: local changes found
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
498 [255]
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
499 $ hg strip tip --keep
13572
1bb2a56a9d73 tests: use $TESTTMP more and use (glob) less
Martin Geisler <mg@aragost.com>
parents: 12767
diff changeset
500 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
501 $ hg log --graph
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
502 @ changeset: 0:9ab35a2d17cb
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
503 tag: tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
504 user: test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
505 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
506 summary: a
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
507
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
508 $ hg status
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
509 M bar
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
510 ? b
24709
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
511 ? bar.orig
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
512
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
513 $ rm bar.orig
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
514 $ hg sum
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
515 parent: 0:9ab35a2d17cb tip
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
516 a
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
517 branch: default
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
518 commit: 1 modified, 1 unknown
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
519 update: (current)
25382
6084926366b9 summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents: 25111
diff changeset
520 phases: 1 draft
24709
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
521 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
522
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
523 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
524
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
525 $ touch b
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
526 $ hg add b
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
527 $ hg commit -mb
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
528 $ 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
529
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
530 ... 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
531
18760
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
532 $ hg add c
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
533 $ hg rm bar
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
534 $ 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
535 $ 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
536 $ 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
537 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
538 $ 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
539 ! 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
540 ? 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
541
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
542 ... 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
543
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
544 $ 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
545 $ 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
546 $ 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
547 $ hg status
18760
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
548 $ echo b > b
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
549 $ echo d > d
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
550 $ hg strip --keep tip
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
551 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
552 $ hg status
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
553 M b
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
554 ! bar
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
555 ? c
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
556 ? d
16252
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
557 $ cd ..
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
558
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
559 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
560
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
561 $ 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
562 $ cd issue3299
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
563 $ 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
564 $ 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
565 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
566
16718
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
567 test hg strip -B bookmark
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
568
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
569 $ cd ..
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
570 $ hg init bookmarks
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
571 $ cd bookmarks
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
572 $ 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
573 $ hg bookmark -r 'a' 'todelete'
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
574 $ hg bookmark -r 'b' 'B'
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
575 $ hg bookmark -r 'b' 'nostrip'
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
576 $ hg bookmark -r 'c' 'delete'
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
577 $ hg up -C todelete
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
578 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
579 (activating bookmark todelete)
16718
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
580 $ hg strip -B nostrip
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
581 bookmark 'nostrip' deleted
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
582 abort: empty revision set
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
583 [255]
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
584 $ hg strip -B todelete
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
585 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
586 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
587 bookmark 'todelete' deleted
16718
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
588 $ hg id -ir dcbb326fdec2
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
589 abort: unknown revision 'dcbb326fdec2'!
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
590 [255]
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
591 $ hg id -ir d62d843c9a01
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
592 d62d843c9a01
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
593 $ hg bookmarks
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
594 B 9:ff43616e5d0f
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
595 delete 6:2702dd0c91e7
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
596 $ hg strip -B delete
21847
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
597 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
598 bookmark 'delete' deleted
16718
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
599 $ hg id -ir 6:2702dd0c91e7
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
600 abort: unknown revision '2702dd0c91e7'!
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
601 [255]
21847
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
602 $ hg update B
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
603 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
604 (activating bookmark B)
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
605 $ echo a > a
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
606 $ hg add a
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
607 $ hg strip -B B
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
608 abort: local changes found
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
609 [255]
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
610 $ hg bookmarks
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
611 * B 6:ff43616e5d0f
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16829
diff changeset
612
21854
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
613 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
614
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
615 $ hg strip -b tip
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
616 hg strip: option -b not recognized
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
617 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
618
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
619 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
620
22112
d968f4741a22 help: normalize extension shadow hint
Matt Mackall <mpm@selenic.com>
parents: 22111
diff changeset
621 (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
622
22117
c1d93edcf004 help: fold repeatable option message into option table header
Matt Mackall <mpm@selenic.com>
parents: 22112
diff changeset
623 options ([+] can be repeated):
21854
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
624
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
625 -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
626 without this option)
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
627 -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
628 (no backup)
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
629 --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
630 -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
631 -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
632 --mq operate on patch repository
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
633
22111
aa5e256839d5 help: improve command summary hint
Matt Mackall <mpm@selenic.com>
parents: 21854
diff changeset
634 (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
635 [255]
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
636
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
637 $ cd ..
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
638
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
639 Verify bundles don't get overwritten:
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
640
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
641 $ hg init doublebundle
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
642 $ cd doublebundle
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
643 $ touch a
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
644 $ hg commit -Aqm a
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
645 $ touch b
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
646 $ hg commit -Aqm b
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
647 $ hg strip -r 0
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
648 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
649 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
650 $ ls .hg/strip-backup
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
651 3903775176ed-e68910bd-backup.hg
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
652 $ 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
653 $ hg strip -r 0
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
654 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
655 $ ls .hg/strip-backup
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
656 3903775176ed-54390173-backup.hg
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
657 3903775176ed-e68910bd-backup.hg
25677
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
658 $ cd ..
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
659
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
660 Test that we only bundle the stripped changesets (issue4736)
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
661 ------------------------------------------------------------
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
662
26173
0f14c40a05c4 test-strip: fix spelling of initialization (en-US)
timeless@mozdev.org
parents: 26012
diff changeset
663 initialization (previous repo is empty anyway)
25677
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
664
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
665 $ hg init issue4736
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
666 $ cd issue4736
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
667 $ echo a > a
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
668 $ hg add a
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
669 $ hg commit -m commitA
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
670 $ echo b > b
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
671 $ hg add b
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
672 $ hg commit -m commitB
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
673 $ echo c > c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
674 $ hg add c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
675 $ hg commit -m commitC
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
676 $ hg up 'desc(commitB)'
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
677 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
678 $ echo d > d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
679 $ hg add d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
680 $ hg commit -m commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
681 created new head
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
682 $ hg up 'desc(commitC)'
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
683 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
684 $ hg merge 'desc(commitD)'
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
685 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
686 (branch merge, don't forget to commit)
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
687 $ hg ci -m 'mergeCD'
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
688 $ hg log -G
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
689 @ changeset: 4:d8db9d137221
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
690 |\ tag: tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
691 | | parent: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
692 | | parent: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
693 | | user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
694 | | date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
695 | | summary: mergeCD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
696 | |
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
697 | o changeset: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
698 | | parent: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
699 | | user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
700 | | date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
701 | | summary: commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
702 | |
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
703 o | changeset: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
704 |/ user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
705 | date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
706 | summary: commitC
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
707 |
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
708 o changeset: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
709 | user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
710 | date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
711 | summary: commitB
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
712 |
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
713 o changeset: 0:105141ef12d0
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
714 user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
715 date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
716 summary: commitA
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
717
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
718
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
719 Check bundle behavior:
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
720
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
721 $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
722 2 changesets found
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
723 $ hg log -r 'bundle()' -R ../issue4736.hg
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
724 changeset: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
725 parent: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
726 user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
727 date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
728 summary: commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
729
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
730 changeset: 4:d8db9d137221
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
731 tag: tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
732 parent: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
733 parent: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
734 user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
735 date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
736 summary: mergeCD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
737
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
738
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
739 check strip behavior
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
740
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
741 $ hg --config extensions.strip= strip 'desc(commitD)' --debug
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
742 resolving manifests
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
743 branchmerge: False, force: True, partial: False
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
744 ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
745 c: other deleted -> r
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
746 removing c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
747 d: other deleted -> r
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
748 removing d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
749 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
750 2 changesets found
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
751 list of changesets:
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
752 6625a516847449b6f0fa3737b9ba56e9f0f3032c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
753 d8db9d1372214336d2b5570f20ee468d2c72fa8b
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
754 saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg (glob)
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
755 invalid branchheads cache (served): tip differs
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
756 truncating cache/rbc-revs-v1 to 24
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
757 $ hg log -G
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
758 o changeset: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
759 | tag: tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
760 | user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
761 | date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
762 | summary: commitC
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
763 |
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
764 @ changeset: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
765 | user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
766 | date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
767 | summary: commitB
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
768 |
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
769 o changeset: 0:105141ef12d0
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
770 user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
771 date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
772 summary: commitA
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
773
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
774
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
775 strip backup content
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
776
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
777 $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
778 changeset: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
779 parent: 1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
780 user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
781 date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
782 summary: commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
783
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
784 changeset: 4:d8db9d137221
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
785 tag: tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
786 parent: 2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
787 parent: 3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
788 user: test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
789 date: Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
790 summary: mergeCD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
791
26012
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
792
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
793 Error during post-close callback of the strip transaction
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
794 (They should be gracefully handled and reported)
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
795
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
796 $ cat > ../crashstrip.py << EOF
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
797 > from mercurial import error
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
798 > def reposetup(ui, repo):
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
799 > class crashstriprepo(repo.__class__):
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
800 > def transaction(self, desc, *args, **kwargs):
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
801 > tr = super(crashstriprepo, self).transaction(self, desc, *args, **kwargs)
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
802 > if desc == 'strip':
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
803 > def crash(tra): raise error.Abort('boom')
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
804 > tr.addpostclose('crash', crash)
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
805 > return tr
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
806 > repo.__class__ = crashstriprepo
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
807 > EOF
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
808 $ hg strip tip --config extensions.crash=$TESTTMP/crashstrip.py
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
809 saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg (glob)
26429
703d331c44ac test-strip: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 26423
diff changeset
810 strip failed, full bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg' (glob)
26012
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
811 abort: boom
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
812 [255]
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
813
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
814