Show More
@@ -1880,11 +1880,11 b' class localrepository(object):' | |||||
1880 | for node in outgoing.missingheads: |
|
1880 | for node in outgoing.missingheads: | |
1881 | ctx = self[node] |
|
1881 | ctx = self[node] | |
1882 | if ctx.obsolete(): |
|
1882 | if ctx.obsolete(): | |
1883 |
raise util.Abort( |
|
1883 | raise util.Abort(mso % ctx) | |
1884 | elif ctx.unstable(): |
|
1884 | elif ctx.unstable(): | |
1885 |
raise util.Abort( |
|
1885 | raise util.Abort(msu % ctx) | |
1886 | elif ctx.bumped(): |
|
1886 | elif ctx.bumped(): | |
1887 |
raise util.Abort( |
|
1887 | raise util.Abort(msb % ctx) | |
1888 | discovery.checkheads(self, remote, outgoing, |
|
1888 | discovery.checkheads(self, remote, outgoing, | |
1889 | remoteheads, newbranch, |
|
1889 | remoteheads, newbranch, | |
1890 | bool(inc)) |
|
1890 | bool(inc)) |
General Comments 0
You need to be logged in to leave comments.
Login now