| author | Martin Geisler <mg@lazybytes.net> |
| Sat, 14 Aug 2010 02:35:44 +0200 | |
| changeset 11858 | 934c7e91c126 |
| parent 11789 | e2bce1c717fa |
| permissions | -rw-r--r-- |
|
6635
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
1 |
adding bar |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
2 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
3 |
created new head |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
4 |
changeset: 4:443431ffac4f |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
5 |
tag: tip |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
6 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
7 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
8 |
summary: e |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
9 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
10 |
changeset: 3:65bd5f99a4a3 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
11 |
parent: 1:ef3a871183d7 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
12 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
13 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
14 |
summary: d |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
15 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
16 |
changeset: 2:264128213d29 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
17 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
18 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
19 |
summary: c |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
20 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
21 |
changeset: 1:ef3a871183d7 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
22 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
23 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
24 |
summary: b |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
25 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
26 |
changeset: 0:9ab35a2d17cb |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
27 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
28 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
29 |
summary: a |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
30 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
31 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
32 |
% before update 4, strip 4 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
33 |
changeset: 4:443431ffac4f |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
34 |
tag: tip |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
35 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
36 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
37 |
summary: e |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
38 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
39 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11200
12e5149cafca
strip: improve full backup message
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
40 |
saved backup bundle to |
|
6635
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
41 |
% after update 4, strip 4 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
42 |
changeset: 3:65bd5f99a4a3 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
43 |
tag: tip |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
44 |
parent: 1:ef3a871183d7 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
45 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
46 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
47 |
summary: d |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
48 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
49 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
50 |
% before update 4, strip 3 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
51 |
changeset: 4:443431ffac4f |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
52 |
tag: tip |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
53 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
54 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
55 |
summary: e |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
56 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
57 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11200
12e5149cafca
strip: improve full backup message
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
58 |
saved backup bundle to |
|
6635
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
59 |
% after update 4, strip 3 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
60 |
changeset: 1:ef3a871183d7 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
61 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
62 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
63 |
summary: b |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
64 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
65 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
66 |
% before update 1, strip 4 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
67 |
changeset: 1:ef3a871183d7 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
68 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
69 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
70 |
summary: b |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
71 |
|
|
11200
12e5149cafca
strip: improve full backup message
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
72 |
saved backup bundle to |
|
6635
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
73 |
% after update 1, strip 4 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
74 |
changeset: 1:ef3a871183d7 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
75 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
76 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
77 |
summary: b |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
78 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
79 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
80 |
% before update 4, strip 2 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
81 |
changeset: 4:443431ffac4f |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
82 |
tag: tip |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
83 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
84 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
85 |
summary: e |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
86 |
|
|
11200
12e5149cafca
strip: improve full backup message
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
87 |
saved backup bundle to |
|
6635
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
88 |
% after update 4, strip 2 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
89 |
changeset: 3:443431ffac4f |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
90 |
tag: tip |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
91 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
92 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
93 |
summary: e |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
94 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
95 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
96 |
% before update 4, strip 1 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
97 |
changeset: 4:264128213d29 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
98 |
tag: tip |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
99 |
parent: 1:ef3a871183d7 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
100 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
101 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
102 |
summary: c |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
103 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
104 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11200
12e5149cafca
strip: improve full backup message
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
105 |
saved backup bundle to |
|
6635
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
106 |
% after update 4, strip 1 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
107 |
changeset: 0:9ab35a2d17cb |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
108 |
tag: tip |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
109 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
110 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
111 |
summary: a |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
112 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
113 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
114 |
% before update null, strip 4 |
|
11200
12e5149cafca
strip: improve full backup message
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
115 |
saved backup bundle to |
|
6635
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
116 |
% after update null, strip 4 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
117 |
changeset: 4:264128213d29 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
118 |
tag: tip |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
119 |
parent: 1:ef3a871183d7 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
120 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
121 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
122 |
summary: c |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
123 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
124 |
changeset: 3:443431ffac4f |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
125 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
126 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
127 |
summary: e |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
128 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
129 |
changeset: 2:65bd5f99a4a3 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
130 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
131 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
132 |
summary: d |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
133 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
134 |
changeset: 1:ef3a871183d7 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
135 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
136 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
137 |
summary: b |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
138 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
139 |
changeset: 0:9ab35a2d17cb |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
140 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
141 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
142 |
summary: a |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
143 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
144 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
145 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
146 |
(branch merge, don't forget to commit) |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
147 |
% before strip of merge parent |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
148 |
changeset: 2:65bd5f99a4a3 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
149 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
150 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
151 |
summary: d |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
152 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
153 |
changeset: 4:264128213d29 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
154 |
tag: tip |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
155 |
parent: 1:ef3a871183d7 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
156 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
157 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
158 |
summary: c |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
159 |
|
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
160 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11200
12e5149cafca
strip: improve full backup message
Matt Mackall <mpm@selenic.com>
parents:
11197
diff
changeset
|
161 |
saved backup bundle to |
|
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 |
% after strip of merge parent |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
163 |
changeset: 1:ef3a871183d7 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
164 |
user: test |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
165 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
166 |
summary: b |
|
d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
167 |
|
|
11637
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
168 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11789
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
169 |
@ changeset: 4:264128213d29 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
170 |
| tag: tip |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
171 |
| parent: 1:ef3a871183d7 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
172 |
| user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
173 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
174 |
| summary: c |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
175 |
| |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
176 |
| o changeset: 3:443431ffac4f |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
177 |
| | user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
178 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
179 |
| | summary: e |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
180 |
| | |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
181 |
| o changeset: 2:65bd5f99a4a3 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
182 |
|/ user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
183 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
184 |
| summary: d |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
185 |
| |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
186 |
o changeset: 1:ef3a871183d7 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
187 |
| user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
188 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
189 |
| summary: b |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
190 |
| |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
191 |
o changeset: 0:9ab35a2d17cb |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
192 |
user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
193 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
194 |
summary: a |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
195 |
|
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
196 |
% 2 is parent of 3, only one strip should happen |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
197 |
saved backup bundle to |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
198 |
@ changeset: 2:264128213d29 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
199 |
| tag: tip |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
200 |
| user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
201 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
202 |
| summary: c |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
203 |
| |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
204 |
o changeset: 1:ef3a871183d7 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
205 |
| user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
206 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
207 |
| summary: b |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
208 |
| |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
209 |
o changeset: 0:9ab35a2d17cb |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
210 |
user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
211 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
212 |
summary: a |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
213 |
|
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
214 |
o changeset: 4:443431ffac4f |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
215 |
| tag: tip |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
216 |
| user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
217 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
218 |
| summary: e |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
219 |
| |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
220 |
o changeset: 3:65bd5f99a4a3 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
221 |
| parent: 1:ef3a871183d7 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
222 |
| user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
223 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
224 |
| summary: d |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
225 |
| |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
226 |
| @ changeset: 2:264128213d29 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
227 |
|/ user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
228 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
229 |
| summary: c |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
230 |
| |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
231 |
o changeset: 1:ef3a871183d7 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
232 |
| user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
233 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
234 |
| summary: b |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
235 |
| |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
236 |
o changeset: 0:9ab35a2d17cb |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
237 |
user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
238 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
239 |
summary: a |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
240 |
|
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
241 |
% 2 different branches: 2 strips |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
242 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
243 |
saved backup bundle to |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
244 |
saved backup bundle to |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
245 |
@ changeset: 2:65bd5f99a4a3 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
246 |
| tag: tip |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
247 |
| user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
248 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
249 |
| summary: d |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
250 |
| |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
251 |
o changeset: 1:ef3a871183d7 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
252 |
| user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
253 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
254 |
| summary: b |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
255 |
| |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
256 |
o changeset: 0:9ab35a2d17cb |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
257 |
user: test |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
258 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
259 |
summary: a |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
260 |
|
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
261 |
% 2 different branches and a common ancestor: 1 strip |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
262 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
263 |
saved backup bundle to |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
264 |
saved backup bundle to |
|
e2bce1c717fa
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11637
diff
changeset
|
265 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11637
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
266 |
% applied patches before strip |
|
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
267 |
2.diff |
|
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
268 |
3.diff |
|
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
269 |
4.diff |
|
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
270 |
% stripping revision in queue |
|
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
271 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
272 |
saved backup bundle to |
|
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
273 |
% applied patches after stripping rev in queue |
|
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
274 |
2.diff |
|
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
275 |
% stripping ancestor of queue |
|
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
276 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
277 |
saved backup bundle to |
|
64f284da1278
mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents:
11202
diff
changeset
|
278 |
% applied patches after stripping ancestor of queue |