Mercurial > hg > mercurial-source

comparison tests/test-merge-symlinks.t @ 12459:15f07e8e4742

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-merge-symlinks
author Matt Mackall <mpm@selenic.com>
date Sun, 26 Sep 2010 13:43:21 -0500
parents tests/test-merge-symlinks@a6477aa893b8
children de793925862e
comparison
equal deleted inserted replaced
12458:9446bd059da3 12459:15f07e8e4742
1
2 $ cat > echo.py <<EOF
3 > #!/usr/bin/env python
4 > import os, sys
5 > try:
6 > import msvcrt
7 > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
8 > msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
9 > except ImportError:
10 > pass
11 >
12 > for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):
13 > print k, os.environ[k]
14 > EOF
15
16 Create 2 heads containing the same file, once as
17 a file, once as a link. Bundle was generated with:
18
19 # hg init t
20 # cd t
21 # echo a > a
22 # hg ci -qAm t0 -d '0 0'
23 # echo l > l
24 # hg ci -qAm t1 -d '1 0'
25 # hg up -C 0
26 # ln -s a l
27 # hg ci -qAm t2 -d '2 0'
28 # echo l2 > l2
29 # hg ci -qAm t3 -d '3 0'
30
31 $ hg init t
32 $ cd t
33 $ hg -q pull "$TESTDIR/test-merge-symlinks.hg"
34 $ hg up -C 3
35 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
36
37 Merge them and display *_ISLINK vars
38 merge heads
39
40 $ HGMERGE="python ../echo.py" hg merge
41 HG_FILE l
42 HG_MY_ISLINK 1
43 HG_OTHER_ISLINK 0
44 HG_BASE_ISLINK 0
45 merging l
46 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
47 (branch merge, don't forget to commit)
48
49 Test working directory symlink bit calculation wrt copies,
50 especially on non-supporting systems.
51 merge working directory
52
53 $ hg up -C 2
54 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
55 $ hg copy l l2
56 $ HGMERGE="python ../echo.py" hg up 3
57 HG_FILE l2
58 HG_MY_ISLINK 1
59 HG_OTHER_ISLINK 0
60 HG_BASE_ISLINK 0
61 merging l2
62 0 files updated, 1 files merged, 0 files removed, 0 files unresolved