On Fri, Oct 31, 2008 at 1:08 AM, Stephen Butler <sbutler_at_elego.de> wrote:
> Quoting Mark Phippard <markphip_at_gmail.com>:
>> $ svn st wc2
>> M wc2/foo
>> $ svn up wc2
>> C wc2/foo
>> A wc2/bar
>> Updated to revision 2.
>> Summary of conflicts:
>> Tree conflicts: 1
>> $ svn st wc2
>> M C wc2/foo
>> $ svn resolved wc2
>> Resolved conflicted state of 'wc2'
>> $ svn st wc2
>> M wc2/foo
>
>> svn: File not found: transaction '2-2', path '/foo'
>> $ svn add wc2/foo
>> svn: warning: 'wc2/foo' is already under version control
>> $ svn st wc2
>> M wc2/foo
>> $ svn add --force wc2/foo
>> $ svn st wc2
>> M wc2/foo
>> $ svn ci -m "Cannot checkin" wc2Sending wc2/foo
>> subversion/libsvn_client/commit.c:864: (apr_err=160013)
>> svn: Commit failed (details follow):
>> subversion/libsvn_fs_fs/tree.c:661: (apr_err=160013)
>> svn: File not found: transaction '2-3', path '/foo'
>
> Here's a funny message that means "out of date". But running
> svn update again will just re-raise the tree conflict!
> Carrying out the deletion in the first place would solve
> the dilemma.
Just so you know, I was just running some of those commands to show
that there are no commands you can do to get out of the state.
Another problem, although I think it is related to the core issue is
that there is no way to fix your working copy. For example, if I
revert my whole working copy, when I try to run update again at some
point I get this:
Working copy is corrupt
svn: Attempt to add tree conflict that already exists
svn: subversion/libsvn_wc/tree_conflicts.c:518: (apr_err=155016)
So Revert is not removing the tree conflicts from the working copy.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-31 14:57:19 CET