Comments
Patch
@@ -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