On Thu, Jul 16, 2009 at 12:18:27PM +0100, Stefan Sperling wrote:
> On Wed, Jul 15, 2009 at 07:03:00PM -0500, Ryan Schmidt wrote:
> > $ 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.
Actually, "wc2/config" is a directory and not a file in this example.
But the resolution procedure is still the same. The directory
will be unversioned and its content will stay on disk.
Stefan
Received on 2009-07-16 13:59:33 CEST