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