equal
deleted
inserted
replaced
480 same subrepo should work if the subrepo is clean. |
480 same subrepo should work if the subrepo is clean. |
481 $ hg co other |
481 $ hg co other |
482 A *obstruct/other (glob) |
482 A *obstruct/other (glob) |
483 Checked out revision 1. |
483 Checked out revision 1. |
484 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
484 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
485 (activating bookmark other) |
485 |
486 |
486 This is surprising, but is also correct based on the current code: |
487 This is surprising, but is also correct based on the current code: |
487 $ echo "updating should (maybe) fail" > obstruct/other |
488 $ echo "updating should (maybe) fail" > obstruct/other |
488 $ hg co tip |
489 $ hg co tip |
489 abort: uncommitted changes |
490 abort: uncommitted changes |