equal
deleted
inserted
replaced
1500 # Commit might fail if unresolved files exist |
1500 # Commit might fail if unresolved files exist |
1501 newnode = repo.commit( |
1501 newnode = repo.commit( |
1502 text=commitmsg, user=user, date=date, extra=extra, editor=editor |
1502 text=commitmsg, user=user, date=date, extra=extra, editor=editor |
1503 ) |
1503 ) |
1504 |
1504 |
1505 repo.dirstate.setbranch(repo[newnode].branch()) |
1505 repo.dirstate.setbranch( |
|
1506 repo[newnode].branch(), repo.currenttransaction() |
|
1507 ) |
1506 return newnode |
1508 return newnode |
1507 |
1509 |
1508 |
1510 |
1509 def rebasenode(repo, rev, p1, p2, base, collapse, wctx): |
1511 def rebasenode(repo, rev, p1, p2, base, collapse, wctx): |
1510 """Rebase a single revision rev on top of p1 using base as merge ancestor""" |
1512 """Rebase a single revision rev on top of p1 using base as merge ancestor""" |