equal
deleted
inserted
replaced
293 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
293 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
294 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg (glob) |
294 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg (glob) |
295 $ hg unbundle -q .hg/strip-backup/* |
295 $ hg unbundle -q .hg/strip-backup/* |
296 $ hg st --change tip |
296 $ hg st --change tip |
297 M dir1/a |
297 M dir1/a |
|
298 |
|
299 Shelving and unshelving should work |
|
300 |
|
301 $ echo foo >> dir1/a |
|
302 $ hg --config extensions.shelve= shelve |
|
303 shelved as default |
|
304 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
305 $ hg --config extensions.shelve= unshelve |
|
306 unshelving change 'default' |
|
307 $ hg diff --nodates |
|
308 diff -r 708a273da119 dir1/a |
|
309 --- a/dir1/a |
|
310 +++ b/dir1/a |
|
311 @@ -1,1 +1,2 @@ |
|
312 1 |
|
313 +foo |
298 |
314 |
299 Create deeper repo with tree manifests. |
315 Create deeper repo with tree manifests. |
300 |
316 |
301 $ cd .. |
317 $ cd .. |
302 $ hg --config experimental.treemanifest=True init deeprepo |
318 $ hg --config experimental.treemanifest=True init deeprepo |