Patchwork [2,of,6,V4] merge: update comment for future devs

login
register
mail settings
Submitter Sean Farley
Date Jan. 17, 2014, 8:14 p.m.
Message ID <1fea5d10467ba9af2e10.1389989668@laptop.local>
Download mbox | patch
Permalink /patch/3375/
State Accepted
Commit 20ef533ffb01cf419ca2cdb7129b813468a15ac0
Headers show

Comments

Sean Farley - Jan. 17, 2014, 8:14 p.m.
# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1383755185 21600
#      Wed Nov 06 10:26:25 2013 -0600
# Node ID 1fea5d10467ba9af2e1083a43df290749fdf5bcf
# Parent  d21666df8cd1144a799114bb281810602f0cbb88
merge: update comment for future devs

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -678,11 +678,13 @@  def update(repo, node, branchmerge, forc
     onode = node
     wlock = repo.wlock()
     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:
                 if wc.branch() == "default": # no default branch!
                     node = repo.lookup("tip") # update to tip