Mercurial > hg
view tests/test-inotify-issue1556.t @ 20275:2123d27ff75d
backout: avoid update on simple case.
Before the changeset the backout process was:
1) go to <target>
2) revert to <target> parent
3) update back to changeset we came from
The two update steps can takes a very long time to move back and forth unrelated
file change between <target> and current working directory.
The new process is just merging current working directory with the parent of
<target> using <target> as ancestor. This give the very same result but skip
the two updates. On big repo with a lot of files and changes that save a lots of
time (x20 for one week window).
The "merge" version (hg backout --merge) is still done with upgrades. We could
imagine using in memory commit to speed it up but this is another fish.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Wed, 08 Jan 2014 14:53:46 -0800 |
parents | 895d65364570 |
children |
line wrap: on
line source
$ "$TESTDIR/hghave" inotify || exit 80 $ hg init $ touch a b $ hg add a b $ rm b status without inotify $ hg st A a ! b $ echo "[extensions]" >> $HGRCPATH $ echo "inotify=" >> $HGRCPATH inserve $ hg inserve -d --pid-file=hg.pid 2>&1 $ cat hg.pid >> "$DAEMON_PIDS" status $ hg st A a ! b ? hg.pid $ sleep 1 Are we able to kill the service? if not, the service died on some error $ "$TESTDIR/killdaemons.py" hg.pid