Mercurial > hg
view tests/test-inotify-issue1208.t @ 17103:5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
When running convert with a filemap, merge parents which are ancestors
of other parents are ignored. This is hardly a problem when parents
belong to the same branch, but the result could be confusing when named
branches are involved. With:
-o-a1-a2-a3... <- A
\ \
b1-b2-b3...-m- <- B
If all b* revisions are discarded, it is useful to preserve 'm' even if
it is empty after filtering to record the branch switch.
This patch makes filemap preserve "ancestor parents" if there is no
"non-ancestor parent" on the same branch than the merge revision.
Remarks:
- I am not completely convinced by the reasons given above and those
detailed by Matt in this thread:
http://selenic.com/pipermail/mercurial-devel/2012-May/040627.html
The properties we try to preserve are not clearly defined. That said,
I know this patch already helped someone on IRC and the tests output
look reasonable.
- This is a new version of the original "convert: filemap must preserve
fast-forward merges" patch. It has exactly the same output for 2
parents merges, the additional complexity is here to handle more than
two parents.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Mon, 18 Jun 2012 18:19:28 +0200 |
parents | f2719b387380 |
children | cd53e40ab0e2 |
line wrap: on
line source
$ "$TESTDIR/hghave" inotify || exit 80 $ echo "[extensions]" >> $HGRCPATH $ echo "inotify=" >> $HGRCPATH $ p="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" $ hg init $p $ cd $p fail $ ln -sf doesnotexist .hg/inotify.sock $ hg st abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink inotify-client: could not start inotify server: child process failed to start $ hg inserve abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink [255] $ rm .hg/inotify.sock inserve $ hg inserve -d --pid-file=hg.pid $ cat hg.pid >> "$DAEMON_PIDS" status $ hg status ? hg.pid if we try to start twice the server, make sure we get a correct error $ hg inserve -d --pid-file=hg2.pid abort: inotify-server: cannot start: socket is already bound abort: child process failed to start [255] $ kill `cat hg.pid` $ cd ..