# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
# Date
1289564504 -3600
# Node ID
b75264c15cc888cf38c3c7b8f619801e3c2589c7
# Parent
89b2e5d940f669e590096c6be70eee61c9172fff
revsets: overload the branch() revset to also take a branch name.
This should only change semantics in the specific case of a tag/branch
conflict where the tag wasn't done on the branch with the same
name. Previously, branch(whatever) would resolve to the branch of the
tag in that case, whereas now it will resolve to the branch of the
name. The previous behaviour, while documented, seemed very
counter-intuitive to me.
An alternate approach would be to introduce a new revset such as
branchname() or namedbranch(). While this would retain backwards
compatibility, the distinction between it and branch() would not be
readily apparent to users. The most intuitive behaviour would be to
have branch(x) require 'x' to be a branch name, and something like
branchof(x) or samebranch(x) do what branch(x) currently
does. Unfortunately, our backwards compatibility guarantees prevent us
from doing that.
Please note that while 'hg tag' guards against shadowing a branch, 'hg
branch' does not. Besides, even if it did, that wouldn't solve the
issue of conversions with such tags and branches...
$ "$TESTDIR/hghave" inotify || exit 80
$ hg init repo1
$ cd repo1
$ touch a b c d e
$ mkdir dir
$ mkdir dir/bar
$ touch dir/x dir/y dir/bar/foo
$ hg ci -Am m
adding a
adding b
adding c
adding d
adding dir/bar/foo
adding dir/x
adding dir/y
adding e
$ cd ..
$ hg clone repo1 repo2
updating to branch default
8 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "[extensions]" >> $HGRCPATH
$ echo "inotify=" >> $HGRCPATH
$ cd repo2
$ echo b >> a
check that daemon started automatically works correctly
and make sure that inotify.pidfile works
$ hg --config "inotify.pidfile=../hg2.pid" status
M a
make sure that pidfile worked. Output should be silent.
$ kill `cat ../hg2.pid`
$ cd ../repo1
inserve
$ hg inserve -d --pid-file=hg.pid
$ cat hg.pid >> "$DAEMON_PIDS"
let the daemon finish its stuff
$ sleep 1
cannot start, already bound
$ hg inserve
abort: inotify-server: cannot start: socket is already bound
[255]
issue907
$ hg status
? hg.pid
clean
$ hg status -c
C a
C b
C c
C d
C dir/bar/foo
C dir/x
C dir/y
C e
all
$ hg status -A
? hg.pid
C a
C b
C c
C d
C dir/bar/foo
C dir/x
C dir/y
C e
path patterns
$ echo x > dir/x
$ hg status .
M dir/x
? hg.pid
$ hg status dir
M dir/x
$ cd dir
$ hg status .
M x
$ cd ..
issue 1375
testing that we can remove a folder and then add a file with the same name
issue 1375
$ mkdir h
$ echo h > h/h
$ hg ci -Am t
adding h/h
adding hg.pid
$ hg rm h
removing h/h
$ echo h >h
$ hg add h
$ hg status
A h
R h/h
$ hg ci -m0
Test for issue1735: inotify watches files in .hg/merge
$ hg st
$ echo a > a
$ hg ci -Am a
$ hg st
$ echo b >> a
$ hg ci -m ab
$ hg st
$ echo c >> a
$ hg st
M a
$ HGMERGE=internal:local hg up 0
1 files updated, 1 files merged, 2 files removed, 0 files unresolved
$ hg st
M a
$ HGMERGE=internal:local hg up
3 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg st
M a
Test for 1844: "hg ci folder" will not commit all changes beneath "folder"
$ mkdir 1844
$ echo a > 1844/foo
$ hg add 1844
adding 1844/foo
$ hg ci -m 'working'
$ echo b >> 1844/foo
$ hg ci 1844 -m 'broken'
Test for issue884: "Build products not ignored until .hgignore is touched"
$ echo '^build$' > .hgignore
$ hg add .hgignore
$ hg ci .hgignore -m 'ignorelist'
Now, lets add some build products...
$ mkdir build
$ touch build/x
$ touch build/y
build/x & build/y shouldn't appear in "hg st"
$ hg st
$ kill `cat hg.pid`