Gavin Lambert wrote:
> Quoth Gary Feldman <mailto:svnul4228@marsdome.com>:
>
>>This also helps with an uncommon gotcha, when a file has been
>>deleted with svn rm, and then instead of restoring it, it's
>>been added with svn add. Of course, this situation should be
>>fixed, but for the purpose of this question, it's just safer
>>to include all changes, not just the ones that qualify as "M".
>
>
> Define "fixed". Several times I have quite intentionally deleted a file
> and then added another file with the same name, intending that their
> history remain entirely unrelated.
This is a good question if you mean "Subversion should fix it", which is how I
originally took your reply and started typing up ideas.
Then I realized that's not what I meant. What I meant is that if you have a
file added in this way and it's not what should have been done, then you should
manually remove the bastard file (saving a copy), restore the original one, and
then put in the latest version, with any new history (hopefully short) captured
in a single log message. I wasn't suggesting any changes to Subversion, nor
that it be terribly difficult to do this if it's deliberate.
Gary
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 5 23:14:20 2005