Show More
@@ -1547,6 +1547,7 b' def import_(ui, repo, patch1, *patches, ' | |||||
1547 | if p1 != wp[0].node(): |
|
1547 | if p1 != wp[0].node(): | |
1548 | hg.clean(repo, p1, wlock=wlock) |
|
1548 | hg.clean(repo, p1, wlock=wlock) | |
1549 | repo.dirstate.setparents(p1, p2) |
|
1549 | repo.dirstate.setparents(p1, p2) | |
|
1550 | repo.dirstate.setbranch(branch or 'default') | |||
1550 | elif p2: |
|
1551 | elif p2: | |
1551 | try: |
|
1552 | try: | |
1552 | p1 = repo.lookup(p1) |
|
1553 | p1 = repo.lookup(p1) |
General Comments 0
You need to be logged in to leave comments.
Login now