Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 20278:20ef533ffb01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: update comment for future devs
author Sean Farley <sean.michael.farley@gmail.com>
date Wed, 06 Nov 2013 10:26:25 -0600
parents ba6486076429
children 5b4f963d21cc
comparison
equal deleted inserted replaced
20277:c05b968d05eb 20278:20ef533ffb01
678 onode = node 678 onode = node
679 wlock = repo.wlock() 679 wlock = repo.wlock()
680 try: 680 try:
681 wc = repo[None] 681 wc = repo[None]
682 if node is None: 682 if node is None:
683 # tip of current branch 683 # Here is where we should consider bookmarks, divergent bookmarks,
684 # foreground changesets (successors), and tip of current branch;
685 # but currently we are only checking the branch tips.
684 try: 686 try:
685 node = repo.branchtip(wc.branch()) 687 node = repo.branchtip(wc.branch())
686 except error.RepoLookupError: 688 except error.RepoLookupError:
687 if wc.branch() == "default": # no default branch! 689 if wc.branch() == "default": # no default branch!
688 node = repo.lookup("tip") # update to tip 690 node = repo.lookup("tip") # update to tip