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

Re: Possible Working Copy/Repo Corruption Bug

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 11 Jul 2008 18:31:15 +0200

Michael_Abraham_at_Monitor.com wrote:
> Hi:
> I'm running Subversion Sever 1.5.0 on Windows Server 2003 and
> TortoiseSVN 1.5.0, Build 13316 - 32 Bit , 2008/06/21 07:55:29.
> Here is a recipe for reproducing my issue:
> Create an new empty repository
> In the TSVN Repo Browser, create a folder, A using Add Folder ...
> In the TSVN Repo Browser, copy folder A to folder B using Copy To ...
> Checkout folder A to local directory MergeBugA
> Checkout folder B to local directory MergeBugB
> In Windows Explorer, create folder Sub in MergeBugA and copy some files
> to Sub
> Commit the changes to MergeBugA
> Using the TSVN Merge wizard, merge repo folder A to MergeBugB, using all
> default wizard choices. Note that clicking Test Merge in the wizard
> gives the following error message
> Command: Merging revisions UNSPECIFIED of
> http://CAM-SOURCE01.monitor.com/svn/MergeBug/A
> <http://cam-source01.monitor.com/svn/MergeBug/A> into C:\WC\MergeBugB,
> respecting ancestry, Test Only
> Error: Not all required revisions are specified
> Finished!:

That's a bug in TSVN.
Fixed in r13464.

> Finish the Merge and commit MergeBugB
> Make a change to one of the files in MergeBugB/Sub
> Commit the changes to MergeBugB. Get the following error
> Command: Commit
> Modified: WC\MergeBugB\Sub\Activity.hbm.xml
> Sending content: WC\MergeBugB\Sub\Activity.hbm.xml
> Error: Commit failed (details follow):
> Error: A MERGE response for '/svn/MergeBug/A/Sub/Activity.hbm.xml' is
> not a child of
> Error: the destination ('/svn/MergeBug/B/Sub')
> Finished!:
> Check the logs and discover
> (a) The repo was updated even though the error says that the commit failed
> (b) The file in repo folder A was changed, not the file in repo folder B
> I believe that the problem is due to corruption of MergeBugB following
> the commit of the merge.

Thanks for the detailed recipe. I was able to reproduce this with
http://, but not with file://.
I've assembled a script to reproduce the issue with the command line
client and reported it on the Subversion mailing list.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-07-11 18:31:38 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.