##// END OF EJS Templates
largefiles: restore standins from non branch-tip parent at rollback correctly...
largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

File last commit:

r22046:7a9cbb31 default
r22284:72b37865 default
Show More
test-hup.t
38 lines | 903 B | text/troff | Tads3Lexer
Matt Mackall
tests: replace exit 80 with #require
r22046 #require serve fifo
Matt Mackall
tests: unify test-hup
r12413 Test hangup signal in the middle of transaction
$ hg init
$ mkfifo p
Matt Mackall
tests: make test-hup more race-proof...
r16342 $ hg serve --stdio < p 1>out 2>&1 &
Matt Mackall
tests: unify test-hup
r12413 $ P=$!
Matt Mackall
tests: remove sleep/startup/shutdown races from test-hup
r16299
Do test while holding fifo open
$ (
> echo lock
> echo addchangegroup
Pierre-Yves David
tests: prevent test-hup from hanging forever if the transaction does not start...
r20896 > 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
Matt Mackall
tests: remove sleep/startup/shutdown races from test-hup
r16299 > kill -HUP $P
> ) > p
Matt Mackall
tests: make test-hup more race-proof...
r16342
Matt Mackall
tests: avoid zombie lockup with test-hup...
r16344 $ wait
Matt Mackall
tests: make test-hup more race-proof...
r16342 $ cat out
Matt Mackall
tests: unify test-hup
r12413 0
0
adding changesets
transaction abort!
rollback completed
killed!
Matt Mackall
tests: remove sleep/startup/shutdown races from test-hup
r16299
Matt Mackall
tests: unify test-hup
r12413 $ echo .hg/* .hg/store/*
Pierre-Yves David
phases: add rollback support
r15455 .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