Show More
@@ -257,11 +257,11 b' def validdest(repo, old, new):' | |||
|
257 | 257 | """Is the new bookmark destination a valid update from the old one""" |
|
258 | 258 | if old == new: |
|
259 | 259 | # Old == new -> nothing to update. |
|
260 | validdests = () | |
|
260 | return False | |
|
261 | 261 | elif not old: |
|
262 | 262 | # old is nullrev, anything is valid. |
|
263 | 263 | # (new != nullrev has been excluded by the previous check) |
|
264 | validdests = (new,) | |
|
264 | return True | |
|
265 | 265 | elif repo.obsstore: |
|
266 | 266 | # We only need this complicated logic if there is obsolescence |
|
267 | 267 | # XXX will probably deserve an optimised rset. |
@@ -279,6 +279,6 b' def validdest(repo, old, new):' | |||
|
279 | 279 | c.node())) |
|
280 | 280 | validdests = set(repo.set('%ln::', succs)) |
|
281 | 281 | validdests.remove(old) |
|
282 | return new in validdests | |
|
282 | 283 | else: |
|
283 |
|
|
|
284 | return new in validdests | |
|
284 | return new in old.descendants() |
General Comments 0
You need to be logged in to leave comments.
Login now