Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 1495:1e265c2bec94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deal with merge abort more gracefully We save parent info last rather than first.
author Matt Mackall <mpm@selenic.com>
date Wed, 02 Nov 2005 20:22:29 -0800
parents 1a216cb4ee64
children 755e7ac351ef
comparison
equal deleted inserted replaced
1494:249ca10d37f4 1495:1e265c2bec94
1502 self.ui.status(_("(use update -m to merge across branches" 1502 self.ui.status(_("(use update -m to merge across branches"
1503 " or -C to lose changes)\n")) 1503 " or -C to lose changes)\n"))
1504 return 1 1504 return 1
1505 branch_merge = True 1505 branch_merge = True
1506 1506
1507 if moddirstate:
1508 self.dirstate.setparents(p1, p2)
1509
1510 # get the files we don't need to change 1507 # get the files we don't need to change
1511 files = get.keys() 1508 files = get.keys()
1512 files.sort() 1509 files.sort()
1513 for f in files: 1510 for f in files:
1514 if f[0] == "/": continue 1511 if f[0] == "/": continue
1557 if branch_merge: 1554 if branch_merge:
1558 self.dirstate.update(remove, 'r') 1555 self.dirstate.update(remove, 'r')
1559 else: 1556 else:
1560 self.dirstate.forget(remove) 1557 self.dirstate.forget(remove)
1561 1558
1559 if moddirstate:
1560 self.dirstate.setparents(p1, p2)
1561
1562 def merge3(self, fn, my, other): 1562 def merge3(self, fn, my, other):
1563 """perform a 3-way merge in the working directory""" 1563 """perform a 3-way merge in the working directory"""
1564 1564
1565 def temp(prefix, node): 1565 def temp(prefix, node):
1566 pre = "%s~%s." % (os.path.basename(fn), prefix) 1566 pre = "%s~%s." % (os.path.basename(fn), prefix)