I had seen the other post "The item ... already exists" and already tried --renamemode=justFiles (as mentioned above, but note the parameter name needs to be in all lower case), but not the other option.
So, I tried --renamemode=none and it was able to get past the checkin it was having trouble with. Note that I have --deep set by default, and am importing an existing repository with lots of past changes. I presume --renamemode=none does no rename detection
and just treats all the changes as deletes/adds (in TFS the changeset reports 251 files added, 252 files deleted :-).
However, I didn't want all of my checkins to have rename turned off so after it had got past the difficult one I hit Ctrl-C to cancel (so I could do the other checkins without the flag). I wasn't quite quick enough however, and it still pushed up another
four small changesets.
That, of course, then caused me problems as I then had a lock hanging around from the checkin I cancelled and got the error "git-tf: Could not lock $/..." when trying to checkin again. Of course that wasn't too hard to fix (open up Visual Studio,
connect to TFS and Undo checkout to clear the lock).
Does anyone know how to filter/limit the checkin to a particular changeset/point in time? i.e. when doing git tf checkin with the --deep option (which I have as default) it would have been helpful to only checkin the single changeset that was having problems
with the --renamemode=none and then stop automatically.
Or does anyone know if it would work if I simply set my working directory back to the old version, or does checkin do all changesets up to HEAD?
P.S. The other weird thing I just noticed is on the visualstudio.com website (I am using git-tf to load onto TFS in the cloud) the commits are listed for "Saturday, 22 December 2012" even though today is only Friday 21 Dec! (And I am in Australia,
so almost at the front of the timezones, so it is definitely not 22 Dec anywhere yet). Inside Visual Studio appears to have the right time, so it could just be something weird on the visualstudio.com website.