Show More
@@ -229,7 +229,7 b' def unbundle(repo, proto, heads):' | |||||
229 |
|
229 | |||
230 | # fail early if possible |
|
230 | # fail early if possible | |
231 | if not check_heads(): |
|
231 | if not check_heads(): | |
232 |
return |
|
232 | return 'unsynced changes' | |
233 |
|
233 | |||
234 | # write bundle data to temporary file because it can be big |
|
234 | # write bundle data to temporary file because it can be big | |
235 | fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-') |
|
235 | fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-') | |
@@ -243,7 +243,7 b' def unbundle(repo, proto, heads):' | |||||
243 | if not check_heads(): |
|
243 | if not check_heads(): | |
244 | # someone else committed/pushed/unbundled while we |
|
244 | # someone else committed/pushed/unbundled while we | |
245 | # were transferring data |
|
245 | # were transferring data | |
246 |
return |
|
246 | return 'unsynced changes' | |
247 |
|
247 | |||
248 | # push can proceed |
|
248 | # push can proceed | |
249 | fp.seek(0) |
|
249 | fp.seek(0) |
General Comments 0
You need to be logged in to leave comments.
Login now