From patchwork Sun Jan 12 22:25:49 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1,of,6,V2] merge: update comment for future devs
From: Sean Farley <sean.michael.farley@gmail.com>
X-Patchwork-Id: 3309
Message-Id: <da355d69f9830a83f2f8.1389565549@laptop.local>
To: mercurial-devel@selenic.com
Date: Sun, 12 Jan 2014 16:25:49 -0600

# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1383755185 21600
#      Wed Nov 06 10:26:25 2013 -0600
# Node ID da355d69f9830a83f2f8a5efa869a16019c389e4
# Parent  d2704c48f4176d8cd6f21d33500820d44763585c
merge: update comment for future devs

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