Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 48:9f64181ff9a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix resolve bug putting unchanged files in resolve cset
author mpm@selenic.com
date Wed, 11 May 2005 09:44:12 -0800
parents 93e868fa0db8
children 2add70d51441
comparison
equal deleted inserted replaced
47:45cc818f2445 48:9f64181ff9a9
31 31
32 def resolvedag(self, old, new, transaction, link): 32 def resolvedag(self, old, new, transaction, link):
33 """resolve unmerged heads in our DAG""" 33 """resolve unmerged heads in our DAG"""
34 if old == new: return None 34 if old == new: return None
35 a = self.ancestor(old, new) 35 a = self.ancestor(old, new)
36 if old == a: return new 36 if old == a: return None
37 return self.merge3(old, new, a, transaction, link) 37 return self.merge3(old, new, a, transaction, link)
38 38
39 def merge3(self, my, other, base, transaction, link): 39 def merge3(self, my, other, base, transaction, link):
40 """perform a 3-way merge and append the result""" 40 """perform a 3-way merge and append the result"""
41 def temp(prefix, node): 41 def temp(prefix, node):