Show More
@@ -264,8 +264,17 b' class kwtemplater(object):' | |||
|
264 | 264 | if util.binary(data): |
|
265 | 265 | continue |
|
266 | 266 | if expand: |
|
267 | parents = ctx.parents() | |
|
267 | 268 | if lookup: |
|
268 | 269 | ctx = self.linkctx(f, mf[f]) |
|
270 | elif self.restrict and len(parents) > 1: | |
|
271 | # merge commit | |
|
272 | # in case of conflict f is in modified state during | |
|
273 | # merge, even if f does not differ from f in parent | |
|
274 | for p in parents: | |
|
275 | if f in p and not p[f].cmp(ctx[f]): | |
|
276 | ctx = p[f].changectx() | |
|
277 | break | |
|
269 | 278 | data, found = self.substitute(data, f, ctx, re_kw.subn) |
|
270 | 279 | elif self.restrict: |
|
271 | 280 | found = re_kw.search(data) |
@@ -1062,13 +1062,13 b' conflict: keyword should stay outside co' | |||
|
1062 | 1062 | foo |
|
1063 | 1063 | >>>>>>> other: 85d2d2d732a5 - test: simplemerge |
|
1064 | 1064 | |
|
1065 | resolve to local | |
|
1065 | resolve to local, m must contain hash of last change (local parent) | |
|
1066 | 1066 | |
|
1067 | 1067 | $ hg resolve -t internal:local -a |
|
1068 | 1068 | (no more unresolved files) |
|
1069 | 1069 | $ hg commit -m localresolve |
|
1070 | 1070 | $ cat m |
|
1071 |
$Id: m 8 |
|
|
1071 | $Id: m 88a80c8d172e Thu, 01 Jan 1970 00:00:00 +0000 test $ | |
|
1072 | 1072 | bar |
|
1073 | 1073 | |
|
1074 | 1074 | Test restricted mode with transplant -b |
General Comments 0
You need to be logged in to leave comments.
Login now