equal
deleted
inserted
replaced
1689 # performing update to successor of obsolete wdir parent. |
1689 # performing update to successor of obsolete wdir parent. |
1690 # (in case when user passes a revset related to wdir parent '.::') |
1690 # (in case when user passes a revset related to wdir parent '.::') |
1691 if repo['.'].obsolete(): |
1691 if repo['.'].obsolete(): |
1692 result = solveobswdp(ui, repo, opts) |
1692 result = solveobswdp(ui, repo, opts) |
1693 if result != 0 or result is True: |
1693 if result != 0 or result is True: |
|
1694 # return as solving obswdp wasn't successful |
1694 return result |
1695 return result |
1695 |
1696 |
1696 if not revs: |
1697 if not revs: |
1697 return _handlenotrouble(ui, repo, allopt, revopt, anyopt, targetcat) |
1698 return _handlenotrouble(ui, repo, allopt, revopt, anyopt, targetcat) |
1698 |
1699 |