[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Tree conflict reversion yields assertion

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Thu, 3 Sep 2009 12:44:10 +0100

2009/9/3 Patrick Traill <patrick.traill_at_capgemini.com>:
> Tortoise tells me after an update that I have a tree conflict, which
> surprises me.
> Trying to revert it causes an assertion in Tortoise.

The error occurs in the subversion library. Please report this on the
subversion users mailing list.

Thanks,

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
> ------------- 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".
>
> 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.
>
>
> ------------- 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.
> * 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.)
>
>
> ------------- History
> This is a reduced and anonymised copy of the re-branched feature branch.
> Sorry about the volume, but I am not sure what might be relevant!
>
> ------------------------------------------------------------------------
> r46645 | ptraill | 2009-09-02 18:54:15 +0200 (Wed, 02 Sep 2009) | 5
> lines
> Changed paths:
>   M <only files>
>
> <log-message>
> ------------------------------------------------------------------------
> r46641 | ptraill | 2009-08-31 20:26:50 +0200 (Mon, 31 Aug 2009) | 4
> lines
> Changed paths:
>   M
> <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008/TestAPIErrorsCS/S
> erverMultiTest.cs
>   M <only files>
>
> <log-message>
> ------------------------------------------------------------------------
> <revisions only modifying files>
> ------------------------------------------------------------------------
> r46608 | ptraill | 2009-08-21 15:47:16 +0200 (Fri, 21 Aug 2009) | 8
> lines
> Changed paths:
>   D <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2005
>   M <only files>
>
> <log-message>
> ------------------------------------------------------------------------
> <revisions only modifying files>
> ------------------------------------------------------------------------
> r46546 | ptraill | 2009-08-18 16:47:47 +0200 (Tue, 18 Aug 2009) | 18
> lines
> Changed paths:
>   M <only files>
>   M
> <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008/TestAPIErrorsCS/T
> estAPIErrorsCS.cs
>   M <only files>
>
> <log-message>
> ------------------------------------------------------------------------
> r46542 | ptraill | 2009-08-17 19:59:54 +0200 (Mon, 17 Aug 2009) | 2
> lines
> Changed paths:
>   M <only files>
>
> <log-message> .. *Merge* branches/issue/77_at_46532 ..
>
> ------------------------------------------------------------------------
> <revisions only modifying files>
> ------------------------------------------------------------------------
> r46538 | ptraill | 2009-08-17 15:18:48 +0200 (Mon, 17 Aug 2009) | 7
> lines
> Changed paths:
>   A
> <etc>/branches/issue/77/BuildScripts/MSVS_2008/ReleaseClient.testrunconf
> ig (from
> <etc>/trunk/BuildScripts/MSVS_2008/ReleaseClient.testrunconfig:46530)
>   A <simile>
>   R <etc>/branches/issue/77/BuildScripts/MSVS_2008/TestAPIErrorsCS
> (from <etc>/trunk/BuildScripts/MSVS_2008/TestAPIErrorsCS:46254)
>   A <simile>
>   A
> <etc>/branches/issue/77/BuildScripts/MSVS_2008/TestAPIErrorsCS/CustomDic
> tionary.xml (from
> <etc>/trunk/BuildScripts/MSVS_2008/TestAPIErrorsCS/CustomDictionary.xml:
> 46530)
>   A <simile>
>   R
> <etc>/branches/issue/77/BuildScripts/MSVS_2008/TestAPIErrorsCS/OrderedTe
> st1.orderedtest (from
> <etc>/trunk/BuildScripts/MSVS_2008/TestAPIErrorsCS/OrderedTest1.orderedt
> est:46254)
>   A <simile>
>   A <etc>/branches/issue/77/<name>.nsh (from
> <etc>/trunk/<name>.nsh:46530)
>   A <etc>/branches/issue/77/IMSourcesInstall.nsi (from
> <etc>/trunk/IMSourcesInstall.nsi:46530)
>   M <etc>/branches/issue/77_Patrick
>   M <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008
>   M <only files>
>
> <log-message>
> ------------------------------------------------------------------------
> r46531 | ptraill | 2009-08-14 19:38:30 +0200 (Fri, 14 Aug 2009) | 14
> lines
> Changed paths:
>   A <etc>/branches/issue/77_Patrick (from
> <etc>/branches/issue/77:46523)
>   M <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2005
>   M <only files>
>   M <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008
>   A
> <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008/Debug.testrunconf
> ig (from <etc>/trunk/BuildScripts/MSVS_2008/Debug.testrunconfig:46530)
>   M <only files>
>   A
> <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008/LocalTestRun.test
> runconfig (from
> <etc>/trunk/BuildScripts/MSVS_2008/LocalTestRun.testrunconfig:46254)
>   M <only files>
>   A
> <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008/<project>.vsmdi
> (from <etc>/trunk/BuildScripts/MSVS_2008/<project>.vsmdi:46254)
>   A
> <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008/<project>1.vsmdi
> (from <etc>/trunk/BuildScripts/MSVS_2008/<project>1.vsmdi:46254)
>   A
> <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008/<project>10.vsmdi
> (from <etc>/trunk/BuildScripts/MSVS_2008/<project>10.vsmdi:46530)
>   A <simile>
>   M <only files>
>   A
> <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008/TestAPIErrorsCS
> (from <etc>/trunk/BuildScripts/MSVS_2008/TestAPIErrorsCS:46254)
>   R
> <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008/TestAPIErrorsCS/A
> uthoringTests.txt (from
> <etc>/trunk/BuildScripts/MSVS_2008/TestAPIErrorsCS/AuthoringTests.txt:46
> 254)
>   A
> <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008/TestAPIErrorsCS/C
> ustomDictionary.xml (from
> <etc>/trunk/BuildScripts/MSVS_2008/TestAPIErrorsCS/CustomDictionary.xml:
> 46530)
>   A <simile>
>   R
> <etc>/branches/issue/77_Patrick/BuildScripts/MSVS_2008/TestAPIErrorsCS/O
> rderedTest1.orderedtest (from
> <etc>/trunk/BuildScripts/MSVS_2008/TestAPIErrorsCS/OrderedTest1.orderedt
> est:46254)
>   A <simile>
>   M <etc>/branches/issue/77_Patrick/<name>.nsh
>   M <etc>/branches/issue/77_Patrick/<name>.nsi
>   A <etc>/branches/issue/77_Patrick/<name>.nsh (from
> <etc>/trunk/<name>.nsh:46530)
>   A <simile>
>   M <only files>
>   A <etc>/branches/issue/77_Patrick/trader_server-2009-08-03.c (from
> <etc>/trunk/trader_server-2009-08-03.c:46530)
>   M <only files>
>
> <log-message>
> ------------------------------------------------------------------------
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2390608
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-03 14:12:44 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.