Show More
| @@ -26,7 +26,6 b' def rebasemerge(repo, rev, first=False):' | |||||
| 26 |
|
26 | |||
| 27 | def newancestor(a, b, pfunc): |
|
27 | def newancestor(a, b, pfunc): | |
| 28 | ancestor.ancestor = oldancestor |
|
28 | ancestor.ancestor = oldancestor | |
| 29 | anc = ancestor.ancestor(a, b, pfunc) |
|
|||
| 30 | if b == rev: |
|
29 | if b == rev: | |
| 31 | return repo[rev].parents()[0].rev() |
|
30 | return repo[rev].parents()[0].rev() | |
| 32 | return ancestor.ancestor(a, b, pfunc) |
|
31 | return ancestor.ancestor(a, b, pfunc) | |
General Comments 0
You need to be logged in to leave comments.
Login now