equal
deleted
inserted
replaced
2366 |
2366 |
2367 |
2367 |
2368 def back_out(ctx, parent=None, wc=None): |
2368 def back_out(ctx, parent=None, wc=None): |
2369 if parent is None: |
2369 if parent is None: |
2370 if ctx.p2() is not None: |
2370 if ctx.p2() is not None: |
2371 raise error.ProgrammingError( |
2371 msg = b"must specify parent of merge commit to back out" |
2372 b"must specify parent of merge commit to back out" |
2372 raise error.ProgrammingError(msg) |
2373 ) |
|
2374 parent = ctx.p1() |
2373 parent = ctx.p1() |
2375 return _update( |
2374 return _update( |
2376 ctx.repo(), |
2375 ctx.repo(), |
2377 parent, |
2376 parent, |
2378 branchmerge=True, |
2377 branchmerge=True, |