Mercurial > hg
annotate tests/test-mq-strip.t @ 14258:50e3fb2ab9fa
record: unconditionally update the working dir after patching
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 08 May 2011 17:48:29 +0200 |
parents | 1bb2a56a9d73 |
children | cf17e76be4dd |
rev | line source |
---|---|
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
1 $ echo "[extensions]" >> $HGRCPATH |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
2 $ echo "mq=" >> $HGRCPATH |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
3 $ echo "graphlog=" >> $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 |
6635
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
191 |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
192 $ hg up -C 2 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
193 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
|
194 $ hg merge 4 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
195 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
|
196 (branch merge, don't forget to commit) |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
197 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
198 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
|
199 |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
200 $ hg parents |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
201 changeset: 2:65bd5f99a4a3 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
202 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
203 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
|
204 summary: d |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
205 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
206 changeset: 4:264128213d29 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
207 tag: tip |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
208 parent: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
209 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
210 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
|
211 summary: c |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
212 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
213 $ hg strip 4 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
214 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
|
215 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
|
216 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
217 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
|
218 |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
219 $ hg parents |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
220 changeset: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
221 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
222 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
|
223 summary: b |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
224 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
225 $ restore |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
226 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
227 $ hg up |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
228 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
|
229 $ hg glog |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
230 @ changeset: 4:264128213d29 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
231 | tag: tip |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
232 | parent: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
233 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
234 | 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
|
235 | summary: c |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
236 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
237 | o changeset: 3:443431ffac4f |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
238 | | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
239 | | 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
|
240 | | summary: e |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
241 | | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
242 | o changeset: 2:65bd5f99a4a3 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
243 |/ user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
244 | 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
|
245 | summary: d |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
246 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
247 o changeset: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
248 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
249 | 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
|
250 | summary: b |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
251 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
252 o changeset: 0:9ab35a2d17cb |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
253 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
254 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
|
255 summary: a |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
256 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
257 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
258 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
|
259 |
12767
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
260 $ hg strip "roots(2)" 3 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12376
diff
changeset
|
261 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
|
262 $ hg glog |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
263 @ changeset: 2:264128213d29 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
264 | tag: tip |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
265 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
266 | 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
|
267 | summary: c |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
268 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
269 o changeset: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
270 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
271 | date: Thu Jan 01 00:00:00 1970 +0000 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
272 | summary: b |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
273 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
274 o changeset: 0:9ab35a2d17cb |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
275 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
276 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
|
277 summary: a |
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 $ restore |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
280 $ hg glog |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
281 o changeset: 4:443431ffac4f |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
282 | tag: tip |
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: e |
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 o changeset: 3:65bd5f99a4a3 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
288 | parent: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
289 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
290 | 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
|
291 | summary: d |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
292 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
293 | @ changeset: 2:264128213d29 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
294 |/ user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
295 | 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
|
296 | summary: c |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
297 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
298 o changeset: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
299 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
300 | 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
|
301 | summary: b |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
302 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
303 o changeset: 0:9ab35a2d17cb |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
304 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
305 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
|
306 summary: a |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
307 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
308 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
309 2 different branches: 2 strips |
11789
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
310 |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
311 $ hg strip 2 4 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
312 0 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
|
313 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12376
diff
changeset
|
314 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
|
315 $ hg glog |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
316 @ changeset: 2:65bd5f99a4a3 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
317 | tag: tip |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
318 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
319 | 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
|
320 | summary: d |
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 o changeset: 1:ef3a871183d7 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
323 | user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
324 | 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
|
325 | summary: b |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
326 | |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
327 o changeset: 0:9ab35a2d17cb |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
328 user: test |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
329 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
|
330 summary: a |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
331 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
332 $ restore |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
333 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
334 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
|
335 |
12767
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
336 $ hg strip 1 "2|4" |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
337 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
|
338 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
|
339 $ restore |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
340 |
12767
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
341 stripping an empty revset |
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
342 |
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
343 $ hg strip "1 and not 1" |
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
344 abort: empty revision set |
c3316b6a3219
strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
12682
diff
changeset
|
345 [255] |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
346 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
347 remove branchy history for qimport tests |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
348 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
349 $ hg strip 3 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12376
diff
changeset
|
350 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
|
351 |
11906
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
352 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
353 strip of applied mq should cleanup status file |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
354 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
355 $ hg up -C 3 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
356 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
|
357 $ echo fooagain >> bar |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
358 $ hg ci -mf |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
359 $ hg qimport -r tip:2 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
360 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
361 applied patches before strip |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
362 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
363 $ hg qapplied |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
364 2.diff |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
365 3.diff |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
366 4.diff |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
367 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
368 stripping revision in queue |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
369 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
370 $ hg strip 3 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
371 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
|
372 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
|
373 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
374 applied patches after stripping rev in queue |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
375 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
376 $ hg qapplied |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
377 2.diff |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
378 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
379 stripping ancestor of queue |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
380 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
381 $ hg strip 1 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
382 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
|
383 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
|
384 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
385 applied patches after stripping ancestor of queue |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
386 |
1219d019339d
tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11789
diff
changeset
|
387 $ hg qapplied |
12682
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
388 |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
389 Verify strip protects against stripping wc parent when there are uncommited mods |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
390 |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
391 $ echo b > b |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
392 $ hg add b |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
393 $ hg ci -m 'b' |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
394 $ hg log --graph |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
395 @ changeset: 1:7519abd79d14 |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
396 | tag: tip |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
397 | user: test |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
398 | 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
|
399 | summary: b |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
400 | |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
401 o changeset: 0:9ab35a2d17cb |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
402 user: test |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
403 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
|
404 summary: a |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
405 |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
406 |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
407 $ echo c > b |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
408 $ echo c > bar |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
409 $ hg strip tip |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
410 abort: local changes found |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
411 [255] |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
412 $ hg strip tip --keep |
13572
1bb2a56a9d73
tests: use $TESTTMP more and use (glob) less
Martin Geisler <mg@aragost.com>
parents:
12767
diff
changeset
|
413 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
|
414 $ hg log --graph |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
415 @ changeset: 0:9ab35a2d17cb |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
416 tag: tip |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
417 user: test |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
418 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
|
419 summary: a |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
420 |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
421 $ hg status |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
422 M bar |
58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents:
12640
diff
changeset
|
423 ? b |