Re: 1.6 blocker? copy operation during update fails

On Sat, Jan 10, 2009 at 01:42:12AM +0100, Neels J Hofmeyr wrote:
>
> WTF! I just noticed that current trunk shows 'alpha' scheduled *added*
> instead of deleted (if I remove the line that modifies 'alpha.moved' after
> the move from stefan's script).
>
> [[[
> $ svn update tc_moved_edited/trunk2
> C tc_moved_edited/trunk2/alpha
> A tc_moved_edited/trunk2/alpha.moved
> Updated to revision 2.
> Summary of conflicts:
> Tree conflicts: 1
>
> $ svn st tc_moved_edited/trunk2
> A + C tc_moved_edited/trunk2/alpha
> > local edit, incoming delete upon update
> M tc_moved_edited/trunk2/alpha.moved
> ]]]
>
> How can that be. alpha is definitely deleted, not added.

Note that 'D' means '_scheduled_ _for_ deletion'.

The file has already been deleted in HEAD at the time you run
the update.

You cannot schedule a file which is already removed in HEAD for
deletion again. That does not make sense.

The only options are to leave the file deleted in HEAD (i.e. do
nothing about it, the file gets unversioned or physically removed
in the WC), or you re-add the file, preferably with history so that
it has a link to its once-deleted ancestor.

Stefan
Received on 2009-01-10 11:16:27 CET