equal
deleted
inserted
replaced
1870 |
1870 |
1871 util.rename(q.join(patch), absdest) |
1871 util.rename(q.join(patch), absdest) |
1872 r = q.qrepo() |
1872 r = q.qrepo() |
1873 if r: |
1873 if r: |
1874 wlock = r.wlock() |
1874 wlock = r.wlock() |
1875 if r.dirstate.state(name) == 'r': |
1875 if r.dirstate[name] == 'r': |
1876 r.undelete([name], wlock) |
1876 r.undelete([name], wlock) |
1877 r.copy(patch, name, wlock) |
1877 r.copy(patch, name, wlock) |
1878 r.remove([patch], False, wlock) |
1878 r.remove([patch], False, wlock) |
1879 |
1879 |
1880 q.save_dirty() |
1880 q.save_dirty() |