On Wed, Jul 15, 2009 at 07:03:00PM -0500, Ryan Schmidt wrote:
> If the file in question already has local modifications in everyone's
> working copy, then there is no problem. Subversion will not
> automatically delete files with local modifications.
> See this
> transcript which shows that, even though I rename a "config"
> directory to "config.sample", a working copy with local changes to a
> file in the "config" directory will still have that "config"
> directory with its modified file in it after updating. There is still
> the conflict to resolve somehow, though.
> $ svn up wc2
> C wc2/config
> A wc2/config.sample
> A wc2/config.sample/some.txt
> Updated to revision 2.
> Summary of conflicts:
> Tree conflicts: 1
> $ svn st wc2
> A + C wc2/config
> > local edit, incoming delete upon update
> M + wc2/config/some.txt
That's easy to resolve.
Run "svn resolve --accept=working wc2/config", and
then unversion the file with "svn revert wc2/config".
As you can see from the "A +" status indication, the file is
automatically scheduled add-with-history to make it easy for
people to keep it. "svn revert" will undo the local add-with-history
and the file will now appear as unversioned.
Received on 2009-07-16 13:19:52 CEST