Mercurial > hg
comparison tests/test-mq-strip.out @ 6635:d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
* * *
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Tue, 03 Jun 2008 12:10:14 +0200 |
parents | |
children | 4bb4895e1693 |
comparison
equal
deleted
inserted
replaced
6634:d6caebe9c293 | 6635:d90d83ebea9e |
---|---|
1 adding bar | |
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 created new head | |
4 changeset: 4:443431ffac4f | |
5 tag: tip | |
6 user: test | |
7 date: Thu Jan 01 00:00:00 1970 +0000 | |
8 summary: e | |
9 | |
10 changeset: 3:65bd5f99a4a3 | |
11 parent: 1:ef3a871183d7 | |
12 user: test | |
13 date: Thu Jan 01 00:00:00 1970 +0000 | |
14 summary: d | |
15 | |
16 changeset: 2:264128213d29 | |
17 user: test | |
18 date: Thu Jan 01 00:00:00 1970 +0000 | |
19 summary: c | |
20 | |
21 changeset: 1:ef3a871183d7 | |
22 user: test | |
23 date: Thu Jan 01 00:00:00 1970 +0000 | |
24 summary: b | |
25 | |
26 changeset: 0:9ab35a2d17cb | |
27 user: test | |
28 date: Thu Jan 01 00:00:00 1970 +0000 | |
29 summary: a | |
30 | |
31 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
32 % before update 4, strip 4 | |
33 changeset: 4:443431ffac4f | |
34 tag: tip | |
35 user: test | |
36 date: Thu Jan 01 00:00:00 1970 +0000 | |
37 summary: e | |
38 | |
39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
40 saving bundle to | |
41 % after update 4, strip 4 | |
42 changeset: 3:65bd5f99a4a3 | |
43 tag: tip | |
44 parent: 1:ef3a871183d7 | |
45 user: test | |
46 date: Thu Jan 01 00:00:00 1970 +0000 | |
47 summary: d | |
48 | |
49 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
50 % before update 4, strip 3 | |
51 changeset: 4:443431ffac4f | |
52 tag: tip | |
53 user: test | |
54 date: Thu Jan 01 00:00:00 1970 +0000 | |
55 summary: e | |
56 | |
57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
58 saving bundle to | |
59 % after update 4, strip 3 | |
60 changeset: 1:ef3a871183d7 | |
61 user: test | |
62 date: Thu Jan 01 00:00:00 1970 +0000 | |
63 summary: b | |
64 | |
65 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
66 % before update 1, strip 4 | |
67 changeset: 1:ef3a871183d7 | |
68 user: test | |
69 date: Thu Jan 01 00:00:00 1970 +0000 | |
70 summary: b | |
71 | |
72 saving bundle to | |
73 % after update 1, strip 4 | |
74 changeset: 1:ef3a871183d7 | |
75 user: test | |
76 date: Thu Jan 01 00:00:00 1970 +0000 | |
77 summary: b | |
78 | |
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
80 % before update 4, strip 2 | |
81 changeset: 4:443431ffac4f | |
82 tag: tip | |
83 user: test | |
84 date: Thu Jan 01 00:00:00 1970 +0000 | |
85 summary: e | |
86 | |
87 saving bundle to | |
88 saving bundle to | |
89 adding branch | |
90 adding changesets | |
91 adding manifests | |
92 adding file changes | |
93 added 2 changesets with 2 changes to 1 files | |
94 % after update 4, strip 2 | |
95 changeset: 3:443431ffac4f | |
96 tag: tip | |
97 user: test | |
98 date: Thu Jan 01 00:00:00 1970 +0000 | |
99 summary: e | |
100 | |
101 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
102 % before update 4, strip 1 | |
103 changeset: 4:264128213d29 | |
104 tag: tip | |
105 parent: 1:ef3a871183d7 | |
106 user: test | |
107 date: Thu Jan 01 00:00:00 1970 +0000 | |
108 summary: c | |
109 | |
110 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
111 saving bundle to | |
112 % after update 4, strip 1 | |
113 changeset: 0:9ab35a2d17cb | |
114 tag: tip | |
115 user: test | |
116 date: Thu Jan 01 00:00:00 1970 +0000 | |
117 summary: a | |
118 | |
119 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
120 % before update null, strip 4 | |
121 saving bundle to | |
122 % after update null, strip 4 | |
123 changeset: 4:264128213d29 | |
124 tag: tip | |
125 parent: 1:ef3a871183d7 | |
126 user: test | |
127 date: Thu Jan 01 00:00:00 1970 +0000 | |
128 summary: c | |
129 | |
130 changeset: 3:443431ffac4f | |
131 user: test | |
132 date: Thu Jan 01 00:00:00 1970 +0000 | |
133 summary: e | |
134 | |
135 changeset: 2:65bd5f99a4a3 | |
136 user: test | |
137 date: Thu Jan 01 00:00:00 1970 +0000 | |
138 summary: d | |
139 | |
140 changeset: 1:ef3a871183d7 | |
141 user: test | |
142 date: Thu Jan 01 00:00:00 1970 +0000 | |
143 summary: b | |
144 | |
145 changeset: 0:9ab35a2d17cb | |
146 user: test | |
147 date: Thu Jan 01 00:00:00 1970 +0000 | |
148 summary: a | |
149 | |
150 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
151 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
152 (branch merge, don't forget to commit) | |
153 % before strip of merge parent | |
154 changeset: 2:65bd5f99a4a3 | |
155 user: test | |
156 date: Thu Jan 01 00:00:00 1970 +0000 | |
157 summary: d | |
158 | |
159 changeset: 4:264128213d29 | |
160 tag: tip | |
161 parent: 1:ef3a871183d7 | |
162 user: test | |
163 date: Thu Jan 01 00:00:00 1970 +0000 | |
164 summary: c | |
165 | |
166 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
167 saving bundle to | |
168 % after strip of merge parent | |
169 changeset: 1:ef3a871183d7 | |
170 user: test | |
171 date: Thu Jan 01 00:00:00 1970 +0000 | |
172 summary: b | |
173 |