annotate tests/test-conflict @ 422:10c43444a38e
[PATCH] Enables lock work under the other 'OS'
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Enables lock work under the other 'OS'
From: K Thananchayan <thananck@yahoo.com>
os.symlink is not supported under Windows. This patch
introduces util.mklockf, util.getlowner that use
regular files under Winodws but symlink under unix.
tweaked by mpm:
- changed function names
- fixed to work on UNIX
manifest hash: 6f650a78a3b203dcad2f861582500b6b4036599a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuN5sywK+sNU5EO8RAva8AJ9L9z/JHRAJS1bix48ZzSpn9ZUyPwCffhmg
UfLSFBmd5tPDDi3mgsrdDEA=
=ZYS9
-----END PGP SIGNATURE-----
author |
mpm@selenic.com |
date |
Tue, 21 Jun 2005 19:43:40 -0800 |
parents |
ee4c80d294e5 |
children |
3d4d5f2aba9a 4fc63e22b1fe |
rev |
line source |
346
|
1 #!/bin/bash
|
|
2
|
|
3 set -x
|
|
4 hg init
|
|
5 echo "nothing" > a
|
|
6 hg add a
|
|
7 hg commit -t ancestor -u test -d "0 0"
|
|
8 echo "something" > a
|
|
9 hg commit -t branch1 -u test -d "0 0"
|
|
10 hg co 0
|
|
11 echo "something else" > a
|
|
12 hg commit -t branch2 -u test -d "0 0"
|
|
13 export HGMERGE=merge
|
|
14 hg -d up -m 1
|
|
15 hg id
|
392
|
16 grep -Ev ">>>|<<<" a
|
346
|
17 hg status
|