Mercurial > public > mercurial-scm > hg

comparison tests/test-subrepo-svn.t @ 21503:10f15e34d86c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: show message when a bookmark is activated by update When updating to a bookmark, mention that the bookmark is now active. This is a reminder that update does not move the current bookmark if an explicit target is given - instead it activates that target.
author Stephen Lee <sphen.lee@gmail.com>
date Thu, 07 Mar 2013 14:17:56 +1100
parents ca275f7ec576
children 652e07debf10
comparison
equal deleted inserted replaced
21502:f8515564d617 21503:10f15e34d86c
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