equal
deleted
inserted
replaced
2034 else: |
2034 else: |
2035 bmdeactivate(repo) |
2035 bmdeactivate(repo) |
2036 displayer.show(c) |
2036 displayer.show(c) |
2037 result = 0 |
2037 result = 0 |
2038 elif children: |
2038 elif children: |
|
2039 ui.warn("ambigious next changeset:\n") |
2039 for c in children: |
2040 for c in children: |
2040 displayer.show(c) |
2041 displayer.show(c) |
2041 ui.warn(_('multiple non-obsolete children, ' |
2042 ui.warn(_('explicitly update to one of them\n')) |
2042 'explicitly update to one of them\n')) |
|
2043 result = 1 |
2043 result = 1 |
2044 else: |
2044 else: |
2045 ui.warn(_('no non-obsolete children\n')) |
2045 ui.warn(_('no children\n')) |
2046 result = 1 |
2046 result = 1 |
2047 return result |
2047 return result |
2048 |
2048 |
2049 def _reachablefrombookmark(repo, revs, mark): |
2049 def _reachablefrombookmark(repo, revs, mark): |
2050 """filter revisions and bookmarks reachable from the given bookmark |
2050 """filter revisions and bookmarks reachable from the given bookmark |