tests/test-issue433
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 02 Nov 2007 14:02:28 -0700
changeset 5503 6f26c7677463
parent 4659 7a7d4937272b
child 8936 1de6e7e1bb9f
permissions -rwxr-xr-x
Test a merge of a symlink against an executable file. This should result in a conflict, but the symlink always wins.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3719
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     1
#!/bin/sh
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     2
# http://www.selenic.com/mercurial/bts/issue433
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     3
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     4
hg init a
4659
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3719
diff changeset
     5
cd a
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3719
diff changeset
     6
echo a > a
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3719
diff changeset
     7
hg commit -Ama
3719
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     8
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     9
hg parents -r 0 doesnotexist
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    10
true