GIT

So git is pretty cool, however I feel it has been modeled in Linus' image, so it's his way or the highway.

One thing that is bothering me a lot is that you can't specify copy sources. Now, if you're copying or moving a file normally, passing enough -Cs might do the trick, as long as the code is also present (or being removed) somewhere in the same commit.

However consider this scenario. Let's assume a linear history for simplicity. On some rev you delete a file, you don't think you'll need it anymore. 10000 revs later, you suddenly want it back.

Now, on svn, you just copy the file from the old revision inside the repo, using svn copy. In git, all you can do is add the file back. However at this point the history is effectively lost (for commands like log or blame). Of course it's still in the repo and if you can remember the original file you might manually look for it, but it's pretty useless compared with svn.

So how would you handle this specific case? Does mercurial support this better? I heard somewhere it supports copies. However I also heard if you delete a file and later add one with the same name, you'll get the log entries of the old file too, which is also wrong (maybe less so).

>>6
Well, if you have a conflict, then what do you expect?