Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/localrepo.py @ 1747:91c56c427171
transitive copy/rename
Add support for transitive copy or rename operations, e.g.
hg rename a b
... (possibly edit b)
hg rename b c
hg commit ...
by actually renaming "b" as "c" while recording a copy of
"a" to "c" and a removal of "a".
| author | Robin Farine <robin.farine@terminus.org> |
|---|---|
| date | Sat, 18 Feb 2006 07:37:59 -0800 |
| parents | 2c9872a4f3fd |
| children | d457fec76ab0 e9bf415a8ecb |
comparison
equal
deleted
inserted
replaced
| 1746:299c3e26ee45 | 1747:91c56c427171 |
|---|---|
| 595 for f in list: | 595 for f in list: |
| 596 p = self.wjoin(f) | 596 p = self.wjoin(f) |
| 597 if os.path.exists(p): | 597 if os.path.exists(p): |
| 598 self.ui.warn(_("%s still exists!\n") % f) | 598 self.ui.warn(_("%s still exists!\n") % f) |
| 599 elif self.dirstate.state(f) == 'a': | 599 elif self.dirstate.state(f) == 'a': |
| 600 self.ui.warn(_("%s never committed!\n") % f) | |
| 601 self.dirstate.forget([f]) | 600 self.dirstate.forget([f]) |
| 602 elif f not in self.dirstate: | 601 elif f not in self.dirstate: |
| 603 self.ui.warn(_("%s not tracked!\n") % f) | 602 self.ui.warn(_("%s not tracked!\n") % f) |
| 604 else: | 603 else: |
| 605 self.dirstate.update([f], "r") | 604 self.dirstate.update([f], "r") |