Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 9030:3f56055ff1d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat: can't compare two values of unequal datatypes
author Alejandro Santos <alejolp@alejolp.com>
date Sun, 05 Jul 2009 11:01:01 +0200
parents ab668c92a036
children 86b4a9b0ddda
comparison
equal deleted inserted replaced
9029:0001e49f1c11 9030:3f56055ff1d7
286 if f == '.hgsubstate': # subrepo states need updating 286 if f == '.hgsubstate': # subrepo states need updating
287 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx)) 287 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx))
288 continue 288 continue
289 f2, fd, flags, move = a[2:] 289 f2, fd, flags, move = a[2:]
290 r = ms.resolve(fd, wctx, mctx) 290 r = ms.resolve(fd, wctx, mctx)
291 if r > 0: 291 if r is not None and r > 0:
292 unresolved += 1 292 unresolved += 1
293 else: 293 else:
294 if r is None: 294 if r is None:
295 updated += 1 295 updated += 1
296 else: 296 else: