equal
deleted
inserted
replaced
152 crosschecking files in changesets and manifests |
152 crosschecking files in changesets and manifests |
153 checking files |
153 checking files |
154 4 files, 9 changesets, 7 total revisions |
154 4 files, 9 changesets, 7 total revisions |
155 $ hg rollback |
155 $ hg rollback |
156 repository tip rolled back to revision 4 (undo pull) |
156 repository tip rolled back to revision 4 (undo pull) |
157 working directory now based on revision -1 |
|
158 $ cd .. |
157 $ cd .. |
159 |
158 |
160 should fail |
159 should fail |
161 |
160 |
162 $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3 |
161 $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3 |
230 crosschecking files in changesets and manifests |
229 crosschecking files in changesets and manifests |
231 checking files |
230 checking files |
232 4 files, 9 changesets, 7 total revisions |
231 4 files, 9 changesets, 7 total revisions |
233 $ hg rollback |
232 $ hg rollback |
234 repository tip rolled back to revision 2 (undo unbundle) |
233 repository tip rolled back to revision 2 (undo unbundle) |
235 working directory now based on revision 2 |
|
236 |
234 |
237 revision 2 |
235 revision 2 |
238 |
236 |
239 $ hg tip -q |
237 $ hg tip -q |
240 2:4ce51a113780 |
238 2:4ce51a113780 |
255 crosschecking files in changesets and manifests |
253 crosschecking files in changesets and manifests |
256 checking files |
254 checking files |
257 2 files, 5 changesets, 5 total revisions |
255 2 files, 5 changesets, 5 total revisions |
258 $ hg rollback |
256 $ hg rollback |
259 repository tip rolled back to revision 2 (undo unbundle) |
257 repository tip rolled back to revision 2 (undo unbundle) |
260 working directory now based on revision 2 |
|
261 $ hg unbundle ../test-bundle-branch2.hg |
258 $ hg unbundle ../test-bundle-branch2.hg |
262 adding changesets |
259 adding changesets |
263 adding manifests |
260 adding manifests |
264 adding file changes |
261 adding file changes |
265 added 4 changesets with 3 changes to 3 files (+1 heads) |
262 added 4 changesets with 3 changes to 3 files (+1 heads) |
275 crosschecking files in changesets and manifests |
272 crosschecking files in changesets and manifests |
276 checking files |
273 checking files |
277 3 files, 7 changesets, 6 total revisions |
274 3 files, 7 changesets, 6 total revisions |
278 $ hg rollback |
275 $ hg rollback |
279 repository tip rolled back to revision 2 (undo unbundle) |
276 repository tip rolled back to revision 2 (undo unbundle) |
280 working directory now based on revision 2 |
|
281 $ hg unbundle ../test-bundle-cset-7.hg |
277 $ hg unbundle ../test-bundle-cset-7.hg |
282 adding changesets |
278 adding changesets |
283 adding manifests |
279 adding manifests |
284 adding file changes |
280 adding file changes |
285 added 2 changesets with 2 changes to 2 files |
281 added 2 changesets with 2 changes to 2 files |