Show More
@@ -103,6 +103,32 b' simplest hgrc using false for merge:' | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now