Show More
@@ -106,11 +106,11 b' def get_log_child(fp, url, paths, start,' | |||
|
106 | 106 | discover_changed_paths, |
|
107 | 107 | strict_node_history, |
|
108 | 108 | receiver) |
|
109 | except SubversionException, (inst, num): | |
|
110 | pickle.dump(num, fp, protocol) | |
|
111 | 109 | except IOError: |
|
112 | 110 | # Caller may interrupt the iteration |
|
113 | 111 | pickle.dump(None, fp, protocol) |
|
112 | except Exception, inst: | |
|
113 | pickle.dump(str(inst), fp, protocol) | |
|
114 | 114 | else: |
|
115 | 115 | pickle.dump(None, fp, protocol) |
|
116 | 116 | fp.close() |
@@ -145,7 +145,7 b' class logstream(object):' | |||
|
145 | 145 | except: |
|
146 | 146 | if entry is None: |
|
147 | 147 | break |
|
148 |
raise |
|
|
148 | raise util.Abort(_("log stream exception '%s'") % entry) | |
|
149 | 149 | yield entry |
|
150 | 150 | |
|
151 | 151 | def close(self): |
@@ -83,7 +83,7 b" def fetch(ui, repo, source='default', **" | |||
|
83 | 83 | # Is this a simple fast-forward along the current branch? |
|
84 | 84 | newheads = repo.branchheads(branch) |
|
85 | 85 | newchildren = repo.changelog.nodesbetween([parent], newheads)[2] |
|
86 | if len(newheads) == 1: | |
|
86 | if len(newheads) == 1 and len(newchildren): | |
|
87 | 87 | if newchildren[0] != parent: |
|
88 | 88 | return hg.clean(repo, newchildren[0]) |
|
89 | 89 | else: |
@@ -102,6 +102,9 b" def fetch(ui, repo, source='default', **" | |||
|
102 | 102 | (len(newheads) - 1)) |
|
103 | 103 | return 1 |
|
104 | 104 | |
|
105 | if not newheads: | |
|
106 | return 0 | |
|
107 | ||
|
105 | 108 | # Otherwise, let's merge. |
|
106 | 109 | err = False |
|
107 | 110 | if newheads: |
General Comments 0
You need to be logged in to leave comments.
Login now