Mercurial > hg

comparison tests/test-merge-tools.t @ 15545:2607de602105

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: test findexe() access check fixed in 58f96703a9ab
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 22 Nov 2011 01:37:26 +0100
parents e7119b091809
children cdbb53a640c1
comparison
equal deleted inserted replaced
15544:53ef627cda30 15545:2607de602105
101 space 101 space
102 # hg stat 102 # hg stat
103 M f 103 M f
104 ? f.orig 104 ? f.orig
105 105
106 unexecutable file in $PATH shouldn't be found:
107
108 $ touch false
109 $ hg up -qC 1
110 $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
111 merging f
112 warning: conflicts during merge.
113 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
114 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
115 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
116 [1]
117 $ rm false
118
119 executable directory in $PATH shouldn't be found:
120
121 $ mkdir false
122 $ hg up -qC 1
123 $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
124 merging f
125 warning: conflicts during merge.
126 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
127 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
128 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
129 [1]
130 $ rmdir false
131
106 true with higher .priority gets precedence: 132 true with higher .priority gets precedence:
107 133
108 $ echo "true.priority=1" >> .hg/hgrc 134 $ echo "true.priority=1" >> .hg/hgrc
109 $ domerge -r 2 135 $ domerge -r 2
110 [merge-tools] 136 [merge-tools]