| commit | 3ff903bfb9e34a02f681f1c95ef7aa3ce4d54d2a | |
| author | Eric Wong <normalperson@yhbt.net> | |
| Sat, 18 Feb 2006 11:49:38 +0000 (18 03:49 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 18 Feb 2006 19:21:16 +0000 (18 11:21 -0800) | ||
| tree | 2f20a5531ee64dd9ac94920536ce3f71121c2a85 | treesnapshot (tar.gz zip) |
| parent | 772d8a3b63ff669c285edb8aff0c63b609614933 | commitdiff |
archimport: remove files from the index before adding/updating
This fixes a bug when importing where a directory gets removed/renamed
but is immediately replaced by a file of the same name in the same
changeset.
This fix only applies to the accurate (default) strategy the moment.
This patch should also fix the fast strategy if/when it is updated
to handle the cases that would've triggered this bug.
This bug was originally found in git-svn, but I remembered I did the
same thing with archimport as well.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This fixes a bug when importing where a directory gets removed/renamed
but is immediately replaced by a file of the same name in the same
changeset.
This fix only applies to the accurate (default) strategy the moment.
This patch should also fix the fast strategy if/when it is updated
to handle the cases that would've triggered this bug.
This bug was originally found in git-svn, but I remembered I did the
same thing with archimport as well.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-archimport.perl | diffblobblamehistory |