Mercurial > hg
changeset 6680:deda205a00e1
Ignore dummy copies in dirstate and localrepo.filecommit()
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 15 Jun 2008 13:01:03 +0200 |
| parents | d286ec1bdcff |
| children | 6a6ef726a2b3 76021ec849c8 |
| files | mercurial/dirstate.py mercurial/localrepo.py tests/test-convert-svn-branches.out |
| diffstat | 3 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dirstate.py Sun Jun 15 13:01:01 2008 +0200 +++ b/mercurial/dirstate.py Sun Jun 15 13:01:03 2008 +0200 @@ -167,6 +167,8 @@ self._dirty = False def copy(self, source, dest): + if source == dest: + return self._dirty = True self._copymap[dest] = source
--- a/mercurial/localrepo.py Sun Jun 15 13:01:01 2008 +0200 +++ b/mercurial/localrepo.py Sun Jun 15 13:01:03 2008 +0200 @@ -688,7 +688,7 @@ meta = {} cp = self.dirstate.copied(fn) - if cp: + if cp and cp != fn: # Mark the new revision of this file as a copy of another # file. This copy data will effectively act as a parent # of this new revision. If this is a merge, the first
--- a/tests/test-convert-svn-branches.out Sun Jun 15 13:01:01 2008 +0200 +++ b/tests/test-convert-svn-branches.out Sun Jun 15 13:01:03 2008 +0200 @@ -117,7 +117,7 @@ | | | | o | branch= 3 change a files: a | | | -| | o branch=old 2 branch trunk, remove c files: a b +| | o branch=old 2 branch trunk, remove c files: | |/ | o branch= 1 hello files: a b c |/