Show More
@@ -32,6 +32,7 b' from mercurial import (' | |||||
32 | commands, |
|
32 | commands, | |
33 | copies, |
|
33 | copies, | |
34 | destutil, |
|
34 | destutil, | |
|
35 | dirstateguard, | |||
35 | error, |
|
36 | error, | |
36 | extensions, |
|
37 | extensions, | |
37 | hg, |
|
38 | hg, | |
@@ -790,7 +791,7 b' def concludenode(repo, rev, p1, p2, comm' | |||||
790 | '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev |
|
791 | '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev | |
791 | but also store useful information in extra. |
|
792 | but also store useful information in extra. | |
792 | Return node of committed revision.''' |
|
793 | Return node of committed revision.''' | |
793 |
dsguard = |
|
794 | dsguard = dirstateguard.dirstateguard(repo, 'rebase') | |
794 | try: |
|
795 | try: | |
795 | repo.setparents(repo[p1].node(), repo[p2].node()) |
|
796 | repo.setparents(repo[p1].node(), repo[p2].node()) | |
796 | ctx = repo[rev] |
|
797 | ctx = repo[rev] |
General Comments 0
You need to be logged in to leave comments.
Login now