| branch | stable |
| changeset 15322 | c8e2a5ea7062 |
| parent 15258 | fe9677449331 |
| child 15476 | 7c06e9c35f2f |
| child 15798 | e6c44dbe902f |
| 15321:e174353e8cda | 15322:c8e2a5ea7062 |
|---|---|
2612 try: |
2612 try: |
2613 if r.dirstate[patch] == 'a': |
2613 if r.dirstate[patch] == 'a': |
2614 r.dirstate.drop(patch) |
2614 r.dirstate.drop(patch) |
2615 r.dirstate.add(name) |
2615 r.dirstate.add(name) |
2616 else: |
2616 else: |
2617 if r.dirstate[name] == 'r': |
|
2618 wctx.undelete([name]) |
|
2619 wctx.copy(patch, name) |
2617 wctx.copy(patch, name) |
2620 wctx.forget([patch]) |
2618 wctx.forget([patch]) |
2621 finally: |
2619 finally: |
2622 wlock.release() |
2620 wlock.release() |
2623 |
2621 |