Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 2803:987c31e2a08c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 16:47:06 -0500
parents b550cd82f92a
children ca06d35af65e
comparison
equal deleted inserted replaced
2802:fdc232d8a193 2803:987c31e2a08c
46 os.unlink(b) 46 os.unlink(b)
47 os.unlink(c) 47 os.unlink(c)
48 return r 48 return r
49 49
50 def update(repo, node, allow=False, force=False, choose=None, 50 def update(repo, node, allow=False, force=False, choose=None,
51 moddirstate=True, forcemerge=False, wlock=None, show_stats=True): 51 moddirstate=True, forcemerge=False, wlock=None, show_stats=True,
52 remind=True):
52 pl = repo.dirstate.parents() 53 pl = repo.dirstate.parents()
53 if not force and pl[1] != nullid: 54 if not force and pl[1] != nullid:
54 raise util.Abort(_("outstanding uncommitted merges")) 55 raise util.Abort(_("outstanding uncommitted merges"))
55 56
56 err = False 57 err = False
335 " you can redo the full merge using:\n" 336 " you can redo the full merge using:\n"
336 " hg update -C %s\n" 337 " hg update -C %s\n"
337 " hg merge %s\n" 338 " hg merge %s\n"
338 % (repo.changelog.rev(p1), 339 % (repo.changelog.rev(p1),
339 repo.changelog.rev(p2)))) 340 repo.changelog.rev(p2))))
340 else: 341 elif remind:
341 repo.ui.status(_("(branch merge, don't forget to commit)\n")) 342 repo.ui.status(_("(branch merge, don't forget to commit)\n"))
342 elif failedmerge: 343 elif failedmerge:
343 repo.ui.status(_("There are unresolved merges with" 344 repo.ui.status(_("There are unresolved merges with"
344 " locally modified files.\n")) 345 " locally modified files.\n"))
345 346