68 |
68 |
69 |
69 |
70 $ teststrip 4 4 |
70 $ teststrip 4 4 |
71 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
71 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
72 % before update 4, strip 4 |
72 % before update 4, strip 4 |
73 changeset: 4:443431ffac4f |
73 @ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce |
74 tag: tip |
74 | |
75 user: test |
75 o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64 |
76 date: Thu Jan 01 00:00:00 1970 +0000 |
76 | |
77 summary: e |
77 | o 2:264128213d290d868c54642d13aeaa3675551a78 |
|
78 |/ |
|
79 o 1:ef3a871183d7199c541cc140218298bbfcc6c28a |
|
80 | |
|
81 o 0:9ab35a2d17cb64271241ea881efcc19dd953215b |
78 |
82 |
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
83 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
80 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
84 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
81 % after update 4, strip 4 |
85 % after update 4, strip 4 |
82 changeset: 3:65bd5f99a4a3 |
86 @ 3:65bd5f99a4a376cdea23a1153f07856b0d881d64 |
83 tag: tip |
87 | |
84 parent: 1:ef3a871183d7 |
88 | o 2:264128213d290d868c54642d13aeaa3675551a78 |
85 user: test |
89 |/ |
86 date: Thu Jan 01 00:00:00 1970 +0000 |
90 o 1:ef3a871183d7199c541cc140218298bbfcc6c28a |
87 summary: d |
91 | |
|
92 o 0:9ab35a2d17cb64271241ea881efcc19dd953215b |
88 |
93 |
89 $ teststrip 4 3 |
94 $ teststrip 4 3 |
90 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
91 % before update 4, strip 3 |
96 % before update 4, strip 3 |
92 changeset: 4:443431ffac4f |
97 @ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce |
93 tag: tip |
98 | |
94 user: test |
99 o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64 |
95 date: Thu Jan 01 00:00:00 1970 +0000 |
100 | |
96 summary: e |
101 | o 2:264128213d290d868c54642d13aeaa3675551a78 |
|
102 |/ |
|
103 o 1:ef3a871183d7199c541cc140218298bbfcc6c28a |
|
104 | |
|
105 o 0:9ab35a2d17cb64271241ea881efcc19dd953215b |
97 |
106 |
98 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
107 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
99 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
108 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
100 % after update 4, strip 3 |
109 % after update 4, strip 3 |
101 changeset: 1:ef3a871183d7 |
110 o 2:264128213d290d868c54642d13aeaa3675551a78 |
102 user: test |
111 | |
103 date: Thu Jan 01 00:00:00 1970 +0000 |
112 @ 1:ef3a871183d7199c541cc140218298bbfcc6c28a |
104 summary: b |
113 | |
|
114 o 0:9ab35a2d17cb64271241ea881efcc19dd953215b |
105 |
115 |
106 $ teststrip 1 4 |
116 $ teststrip 1 4 |
107 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
117 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
108 % before update 1, strip 4 |
118 % before update 1, strip 4 |
109 changeset: 1:ef3a871183d7 |
119 o 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce |
110 user: test |
120 | |
111 date: Thu Jan 01 00:00:00 1970 +0000 |
121 o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64 |
112 summary: b |
122 | |
|
123 | o 2:264128213d290d868c54642d13aeaa3675551a78 |
|
124 |/ |
|
125 @ 1:ef3a871183d7199c541cc140218298bbfcc6c28a |
|
126 | |
|
127 o 0:9ab35a2d17cb64271241ea881efcc19dd953215b |
113 |
128 |
114 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
129 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
115 % after update 1, strip 4 |
130 % after update 1, strip 4 |
116 changeset: 1:ef3a871183d7 |
131 o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64 |
117 user: test |
132 | |
118 date: Thu Jan 01 00:00:00 1970 +0000 |
133 | o 2:264128213d290d868c54642d13aeaa3675551a78 |
119 summary: b |
134 |/ |
|
135 @ 1:ef3a871183d7199c541cc140218298bbfcc6c28a |
|
136 | |
|
137 o 0:9ab35a2d17cb64271241ea881efcc19dd953215b |
120 |
138 |
121 $ teststrip 4 2 |
139 $ teststrip 4 2 |
122 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
140 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
123 % before update 4, strip 2 |
141 % before update 4, strip 2 |
124 changeset: 4:443431ffac4f |
142 @ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce |
125 tag: tip |
143 | |
126 user: test |
144 o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64 |
127 date: Thu Jan 01 00:00:00 1970 +0000 |
145 | |
128 summary: e |
146 | o 2:264128213d290d868c54642d13aeaa3675551a78 |
|
147 |/ |
|
148 o 1:ef3a871183d7199c541cc140218298bbfcc6c28a |
|
149 | |
|
150 o 0:9ab35a2d17cb64271241ea881efcc19dd953215b |
129 |
151 |
130 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
152 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
131 % after update 4, strip 2 |
153 % after update 4, strip 2 |
132 changeset: 3:443431ffac4f |
154 @ 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce |
133 tag: tip |
155 | |
134 user: test |
156 o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64 |
135 date: Thu Jan 01 00:00:00 1970 +0000 |
157 | |
136 summary: e |
158 o 1:ef3a871183d7199c541cc140218298bbfcc6c28a |
|
159 | |
|
160 o 0:9ab35a2d17cb64271241ea881efcc19dd953215b |
137 |
161 |
138 $ teststrip 4 1 |
162 $ teststrip 4 1 |
139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
163 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
140 % before update 4, strip 1 |
164 % before update 4, strip 1 |
141 changeset: 4:264128213d29 |
165 @ 4:264128213d290d868c54642d13aeaa3675551a78 |
142 tag: tip |
166 | |
143 parent: 1:ef3a871183d7 |
167 | o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce |
144 user: test |
168 | | |
145 date: Thu Jan 01 00:00:00 1970 +0000 |
169 | o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64 |
146 summary: c |
170 |/ |
|
171 o 1:ef3a871183d7199c541cc140218298bbfcc6c28a |
|
172 | |
|
173 o 0:9ab35a2d17cb64271241ea881efcc19dd953215b |
147 |
174 |
148 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
176 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
150 % after update 4, strip 1 |
177 % after update 4, strip 1 |
151 changeset: 0:9ab35a2d17cb |
178 @ 0:9ab35a2d17cb64271241ea881efcc19dd953215b |
152 tag: tip |
|
153 user: test |
|
154 date: Thu Jan 01 00:00:00 1970 +0000 |
|
155 summary: a |
|
156 |
179 |
157 $ teststrip null 4 |
180 $ teststrip null 4 |
158 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
181 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
159 % before update null, strip 4 |
182 % before update null, strip 4 |
|
183 o 4:264128213d290d868c54642d13aeaa3675551a78 |
|
184 | |
|
185 | o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce |
|
186 | | |
|
187 | o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64 |
|
188 |/ |
|
189 o 1:ef3a871183d7199c541cc140218298bbfcc6c28a |
|
190 | |
|
191 o 0:9ab35a2d17cb64271241ea881efcc19dd953215b |
|
192 |
160 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
193 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
161 % after update null, strip 4 |
194 % after update null, strip 4 |
|
195 o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce |
|
196 | |
|
197 o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64 |
|
198 | |
|
199 o 1:ef3a871183d7199c541cc140218298bbfcc6c28a |
|
200 | |
|
201 o 0:9ab35a2d17cb64271241ea881efcc19dd953215b |
|
202 |
162 |
203 |
163 $ hg log |
204 $ hg log |
164 changeset: 4:264128213d29 |
205 changeset: 4:264128213d29 |
165 tag: tip |
206 tag: tip |
166 parent: 1:ef3a871183d7 |
207 parent: 1:ef3a871183d7 |