Mercurial > hg
view tests/test-hup.t @ 21537:1ab30e9ba0fc
update: specify custom conflict markers for update (BC)
Add custom conflict markers 'working copy' and 'destination' for doing hg update
when there are conflicts between your working copy and the destination.
author | Durham Goode <durham@fb.com> |
---|---|
date | Fri, 09 May 2014 18:09:11 -0700 |
parents | 9fae01831dea |
children | 7a9cbb315d84 |
line wrap: on
line source
Test hangup signal in the middle of transaction $ "$TESTDIR/hghave" serve fifo || exit 80 $ hg init $ mkfifo p $ hg serve --stdio < p 1>out 2>&1 & $ P=$! Do test while holding fifo open $ ( > echo lock > echo addchangegroup > start=`date +%s` > # 10 second seems much enough to let the server catch up > deadline=`expr $start + 10` > while [ ! -s .hg/store/journal ]; do > sleep 0; > if [ `date +%s` -gt $deadline ]; then > echo "transaction did not start after 10 seconds" >&2; > exit 1; > fi > done > kill -HUP $P > ) > p $ wait $ cat out 0 0 adding changesets 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 .hg/store/journal.phaseroots