Mercurial > hg
view tests/test-hup.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 | 89e7d35e0ef0 |
children | c5c9ca3719f9 |
line wrap: on
line source
Test hangup signal in the middle of transaction $ "$TESTDIR/hghave" fifo || exit 80 $ hg init $ mkfifo p $ hg serve --stdio < p & $ P=$! $ (echo lock; echo addchangegroup; sleep 5) > p & $ Q=$! $ sleep 3 0 0 adding changesets $ kill -HUP $P $ wait transaction abort! rollback completed killed! $ echo .hg/* .hg/store/* .hg/00changelog.i .hg/journal.bookmarks .hg/journal.branch .hg/journal.desc .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a