Mercurial > hg
view tests/test-lock-badness.t @ 14485:610873cf064a
Make pull -u behave like pull && update
Previously, pull would not update if new branch heads were received,
whereas pull && update would move to the tipmost branch head.
Also change the "crosses branches" abort in merge.update from
"crosses branches (merge branches or use --check to force update)"
to
"crosses branches (merge branches or update --check to force update)"
since it can no longer assume the user is running hg update.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 31 May 2011 11:52:22 -0700 |
parents | 4134686b83e1 |
children | a1914d214579 |
line wrap: on
line source
$ hg init a $ echo a > a/a $ hg -R a ci -A -m a adding a $ hg clone a b updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b > b/b $ hg -R b ci -A -m b adding b $ chmod 100 a/.hg/store $ hg -R b push a pushing to a abort: could not lock repository a: Permission denied [255] $ chmod 700 a/.hg/store