Show More
@@ -1017,7 +1017,7 b' def rebasenode(repo, rev, p1, base, stat' | |||||
1017 | # When collapsing in-place, the parent is the common ancestor, we |
|
1017 | # When collapsing in-place, the parent is the common ancestor, we | |
1018 | # have to allow merging with it. |
|
1018 | # have to allow merging with it. | |
1019 | stats = mergemod.update(repo, rev, True, True, base, collapse, |
|
1019 | stats = mergemod.update(repo, rev, True, True, base, collapse, | |
1020 | labels=['dest', 'source']) |
|
1020 | labels=['dest', 'source'], wc=wctx) | |
1021 | if collapse: |
|
1021 | if collapse: | |
1022 | copies.duplicatecopies(repo, wctx, rev, dest) |
|
1022 | copies.duplicatecopies(repo, wctx, rev, dest) | |
1023 | else: |
|
1023 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now