Show More
@@ -299,7 +299,7 b' def reposetup(ui, repo):' | |||||
299 |
|
299 | |||
300 | self.ui.debug("checking for updated bookmarks\n") |
|
300 | self.ui.debug("checking for updated bookmarks\n") | |
301 | rb = remote.listkeys('bookmarks') |
|
301 | rb = remote.listkeys('bookmarks') | |
302 |
change |
|
302 | changed = False | |
303 | for k in rb.keys(): |
|
303 | for k in rb.keys(): | |
304 | if k in self._bookmarks: |
|
304 | if k in self._bookmarks: | |
305 | nr, nl = rb[k], self._bookmarks[k] |
|
305 | nr, nl = rb[k], self._bookmarks[k] | |
@@ -310,12 +310,12 b' def reposetup(ui, repo):' | |||||
310 | continue |
|
310 | continue | |
311 | if cr in cl.descendants(): |
|
311 | if cr in cl.descendants(): | |
312 | self._bookmarks[k] = cr.node() |
|
312 | self._bookmarks[k] = cr.node() | |
313 |
change |
|
313 | changed = True | |
314 | self.ui.status(_("updating bookmark %s\n") % k) |
|
314 | self.ui.status(_("updating bookmark %s\n") % k) | |
315 | else: |
|
315 | else: | |
316 | self.ui.warn(_("not updating divergent" |
|
316 | self.ui.warn(_("not updating divergent" | |
317 | " bookmark %s\n") % k) |
|
317 | " bookmark %s\n") % k) | |
318 |
if change |
|
318 | if changed: | |
319 | write(repo) |
|
319 | write(repo) | |
320 |
|
320 | |||
321 | return result |
|
321 | return result |
General Comments 0
You need to be logged in to leave comments.
Login now