Mercurial > hg
view tests/test-rename-dir-merge2 @ 10013:b2e87fde6806
run-tests: --inotify: use inotify.appendpid to append pids to $DAEMON_PIDS
Introduce a inotify.appendpid configuration possibility that appends pids
to inotify.pidfile when set to True.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Tue, 01 Dec 2009 09:53:02 +0900 |
parents | c95060a5391a |
children |
line wrap: on
line source
#!/bin/sh mkdir r1 cd r1 hg init mkdir a echo foo > a/f hg add a hg ci -m "a/f == foo" cd .. hg clone r1 r2 cd r2 hg mv a b echo foo1 > b/f hg ci -m" a -> b, b/f == foo1" cd .. cd r1 mkdir a/aa echo bar > a/aa/g hg add a/aa hg ci -m "a/aa/g" hg pull ../r2 hg merge hg st -C