14
Vote

Cannot commit changes

description

Error screenshot from TortoiseSVN attached. No eror is reported by SvnBridge

file attachments

comments

AnthonySteele wrote Aug 20, 2008 at 8:58 PM

I'm getting this again today:

Commit
Code\BlogEngines\BlogService\Main\Source\SqlScripts\CreateSchema.sql
Code\BlogEngines\BlogService\Main\Source\SqlScripts\CreateSchema.sql
Commit failed (details follow):
A MERGE response for
'/tfs03.codeplex.com/blogservice/Main/Source/SqlScripts/CreateSchema.sql' is
not a child of the destination ('/tfs03.codeplex.com/Blogservice/Main/Source/SqlScripts')

Codeplex seems to think that everything is OK, the change is shown in the Source code history.
TortoiseSVn seems to think that the change has not yet been checked in, it is shown as committable (red mark on the file's icon in file explorer)

iangregson wrote Sep 8, 2008 at 11:02 AM

Yes i am also getting this as well... i have the latest source (downloaded it and compiled it).... using Visual SVN 1.5.2 and tortoise 1.5.3

ussherm wrote Sep 10, 2008 at 6:33 PM

I'm seeing the same issue as Anthony. I'm trying to add a new file (an-added-file.txt) to my existing source tree (/testproject/someFolder/) that is hosted on my internal TFS server.

My setup:
SvnBridge - latest bits off TRUNK (rev# 22689)
TortoiseSVN - latest bits (v1.5.2, build #13595 - 32bit)
TFS server 2005

Error reported in TortoiseSVN

Error: Commit failed (details follow):
Error: A MERGE response for
Error: '/my-tfs-server/testproject/someFolder/an-added-file.txt' is not a child
Error: of the destination ('/my-tfs-server/testproject/someFolder)

trasa wrote Oct 19, 2008 at 5:12 AM

I am getting this same problem using latest code and TortoiseSvn 1.5.4. Prior to that I was using an older version of Tortoise Svn (1.4) and commits were working...

trasa wrote Oct 19, 2008 at 3:44 PM

Possible workaround: I uninstalled tortoise 1.5.4 and rolled back to TortoiseSvn 1.4.8 -- commits are working now.

Coincidence, or SVN bug, who can say.

quocble wrote Oct 13, 2010 at 5:46 PM

Here's the patch:

add to Merge Handler.cs:73
            string dpath = PathParser.ToApplicationPath(request, Helper.Encode(item.Path, true));

            if (item.Type == ItemType.Folder)
            {
                dpath = dpath.Replace("$/", "");
            }

quocble wrote Oct 13, 2010 at 6:45 PM

The patch doesn't work. Please don't use it.

The better fix is to make sure you're using the URL with $ for example..
http://mac016:8080/tfsweb1:8080/$/Dev

VincentChoiniere wrote Aug 17, 2011 at 1:07 PM

I'm getting this error with the lastest version : SvnBridge v6, tortoiseSVN 1.6.16 and TFS 2008

TFS have the right version, but tortoise think that the change has not yet been checked.

jonasahlgren wrote Oct 12, 2011 at 10:30 AM

Have the same problem using.
  • SvnBridge v6
  • TurtoiseSVN 1.7.0
The only workaround i see is to use a older version of TurtoiseSVN. But TurtoiseSVN 1.4.8 cant be downloaded anymore. Is there any other workaround? Or do I need to give up using SvnBridge?

oberdan wrote Feb 9, 2012 at 3:19 PM

I'm using XCode and getting the same problem.
Does someone has already found a workaround?
Tks

platstar wrote Jan 3, 2013 at 7:11 AM

about issue below
A MERGE response for xxxxxxxxxx not a child of the destination

Please make sure your folder and repository url is correct mapping to tfs collection team project structure

Url of Repository:
http://tfserver/AProject

Checkout directory:
D:\SVN\DefaultCollection\AProject
D:\SVN\DefaultCollection\BProject

TFS DefaultCollection:
$/AProject
$/BProject

dmeador wrote Jan 23, 2013 at 4:35 PM

To reiterate what platstar said, make sure all paths match what is on the server (case sensitive). In my case, I was referencing the svn repository using a lowercase path instead of camel case.

mahmoud690 wrote Aug 10, 2014 at 2:43 PM

Thanks plaster! It solved my problem :)