##// END OF EJS Templates
merge: update comment for future devs
Sean Farley -
r20278:20ef533f default
parent child Browse files
Show More
@@ -680,7 +680,9 b' def update(repo, node, branchmerge, forc'
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:
General Comments 0
You need to be logged in to leave comments. Login now