Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 10320:808c187fc556

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: minor formatting - remove double space
author Henri Wiechers <hwiechers@gmail.com>
date Fri, 05 Feb 2010 17:02:27 +0200
parents 08a0f04b56bd
children d9a2bc2f776b
comparison
equal deleted inserted replaced
10318:325a6aa95eea 10320:808c187fc556
746 if fparent2 != nullid or flog.cmp(fparent1, text) or meta: 746 if fparent2 != nullid or flog.cmp(fparent1, text) or meta:
747 changelist.append(fname) 747 changelist.append(fname)
748 return flog.add(text, meta, tr, linkrev, fparent1, fparent2) 748 return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
749 749
750 # are just the flags changed during merge? 750 # are just the flags changed during merge?
751 if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): 751 if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags():
752 changelist.append(fname) 752 changelist.append(fname)
753 753
754 return fparent1 754 return fparent1
755 755
756 def commit(self, text="", user=None, date=None, match=None, force=False, 756 def commit(self, text="", user=None, date=None, match=None, force=False,