Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: update comment for future devs
authorSean Farley <sean.michael.farley@gmail.com>
Wed, 06 Nov 2013 10:26:25 -0600
changeset 20278 20ef533ffb01
parent 20277 c05b968d05eb
child 20279 5b4f963d21cc
merge: update comment for future devs
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Wed Jan 15 18:14:12 2014 -0600
+++ b/mercurial/merge.py	Wed Nov 06 10:26:25 2013 -0600
@@ -680,7 +680,9 @@
     try:
         wc = repo[None]
         if node is None:
-            # tip of current branch
+            # Here is where we should consider bookmarks, divergent bookmarks,
+            # foreground changesets (successors), and tip of current branch;
+            # but currently we are only checking the branch tips.
             try:
                 node = repo.branchtip(wc.branch())
             except error.RepoLookupError:
hg-stable