Show More
@@ -279,7 +279,9 b' def _bookmarkmovements(repo, tostrip):' | |||||
279 | if rev in tostrip: |
|
279 | if rev in tostrip: | |
280 | updatebm.append(m) |
|
280 | updatebm.append(m) | |
281 | newbmtarget = None |
|
281 | newbmtarget = None | |
282 | if updatebm: # don't compute anything is there is no bookmark to move anyway |
|
282 | # If we need to move bookmarks, compute bookmark | |
|
283 | # targets. Otherwise we can skip doing this logic. | |||
|
284 | if updatebm: | |||
283 | # For a set s, max(parents(s) - s) is the same as max(heads(::s - s)), |
|
285 | # For a set s, max(parents(s) - s) is the same as max(heads(::s - s)), | |
284 | # but is much faster |
|
286 | # but is much faster | |
285 | newbmtarget = repo.revs('max(parents(%ld) - (%ld))', tostrip, tostrip) |
|
287 | newbmtarget = repo.revs('max(parents(%ld) - (%ld))', tostrip, tostrip) |
General Comments 0
You need to be logged in to leave comments.
Login now