Quoting Patrick Traill <patrick.traill_at_capgemini.com>:
> (Originally reported to tortoise, who said it was a subversion problem)
>
> Tortoise tells me after an update that I have a tree conflict, which
> surprises me.
> Trying to revert it causes an assertion in Tortoise.
>
>
> ------------- Context
> This occurs in a WC for an feature branch, which I had re-branched to a
> new name in the same repository-directory (from branches/issue/77 to
> branches/issue/77_Patrick).
> I re-branched it after a merge from the trunk, which introduced the
> directory now reported as having a tree-conflict.
> The WC has been switched to the new URL.
>
>
> ------------- Errors
> Having saved a copy of my WC, I tried to resolve it with Edit Conflicts,
> but whether I choose to keep the Repository or local directory, I get
> "Tree conflicts can only be resolved to 'working' state; <dir> not
> resolved".
The tree conflict handling does not support interactive resolution.
This is likely to improve in the future, but not for 1.6.
In Tortoise, resolve the tree conflict directly instead of editing
conflicts.
>
> If I try to revert the directory,
> I get an assertion failure in line 568 of libsvn_wc\tree_conflicts.c
> (dir_path = svn_path_dirname (victim_path, pool)).
> If that produced a zip-file, I couldn't find it.
I discovered this revert bug (in a switched, tree-conflicted directory)
myself yesterday. It should be pretty straightforward to fix it for
the 1.6.6 release.
>
>
> ------------- Status
> When I ask the status I now get:
> C:\Documents and Settings\ptraill\My
> Documents\IM\Work\branches\issue\77>svn status -u
> ? extra.h
> M 46646 BuildScripts\MSVS_2008\OpenGAC_Win32_Alles.vsmdi
> M 46646 BuildScripts\MSVS_2008\OpenGAC_Win32_Alles11.vsmdi
> M 46646 BuildScripts\MSVS_2008\OpenGAC_Win32_Alles.sln
> M 46646 BuildScripts\MSVS_2008\OpenGAC_Win32_Alles1.vsmdi
> ! S C 46646 BuildScripts\MSVS_2008\TestAPIErrorsCS
> > local add, incoming add upon update
> Status against revision: 46646
>
> I shall do a new Checkout, if I get any more problems.
>
>
> ------------- Configuration
> I am using:
> TortoiseSVN 1.6.5, Build 16974 - 32 Bit , 2009/08/20 08:13:46
> Subversion 1.6.5,
> apr 1.3.8
> apr-utils 1.3.9
> neon 0.28.6
> OpenSSL 0.9.8k 25 Mar 2009
> zlib 1.2.3
>
> The http protocol to access a repository, of whose version I am not
> sure, and I cannot find a client-command to display it.
> Or is it hidden in the Repository UUID:
> 3592e360-ca07-0410-9a4d-8d00377716b5 ?
>
> Windows XP 5.1 SP3
>
> I also sometimes use (to automate extraction of version information):
> svn, version 1.6.0 (r36650) compiled Mar 26 2009, 08:29:37
> Copyright (C) 2000-2009 CollabNet.
> Subversion is open source software, see http://subversion.tigris.org/
> This product includes software developed by CollabNet
> (http://www.Collab.Net/).
> The following repository access (RA) modules are available:
> * ra_neon : Module for accessing a repository via WebDAV protocol
> using Neon.
> - handles 'http' scheme
> - handles 'https' scheme
> * ra_svn : Module for accessing a repository using the svn network
> protocol.
> - with Cyrus SASL authentication
> - handles 'svn' scheme
> * ra_local : Module for accessing a repository on local disk.
> - handles 'file' scheme
> * ra_serf : Module for accessing a repository via WebDAV protocol
> using serf.
> - handles 'http' scheme
> - handles 'https' scheme
>
> N.B.
> * It would be easier to report if the text in error-dialogues was
> selectable.
You could submit this feature request to the TortoiseSVN project.
Regards,
Steve
> * A right-click on the conlfict in the Update dialogue did not offer any
> useful actions.
> ** (I forget what they were, and it is closed now.)
--
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390781
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-03 20:03:47 CEST