Quoth Jimmy:
> That worked for the first snapshot, but not the second snapshot. svn
> complained that I had to update (the second snapshot) before committing. I
> tried that, but the udpate failed when it reached a file that was added in the
> first snapshot. I suppose I could delete that new file from the 2nd snapshot,
> but that would suck if I made some changes to that file in the 2nd snapshot. I
> suppose I could make a duplicate of the directory tree of the 2nd snapshot,
> delete all the .svn files from that copy, update the original version of the
> 2nd snapshot, and then copy over the copy of the 2nd snapshot onto the 2nd
> snapshot itself... but that seems hacky. Is there a better way to do this?
I think you can use svn_load_dirs.pl for that purpose. I'm not sure if
you'll have to remove the .svn folders from your snapshots beforehand or
not, but I think not. (Just treat those snapshots as unversioned vendor
images, not as existing working copies.)
The other advantage of the script is that you can resolve moves/renames
using it, though you'll have to tell it what you've done.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Oct 25 04:55:46 2006