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

Problem while merging two different repositories

From: Anthony Ogier <aogier_at_iorga-group.com>
Date: 2006-11-15 18:57:24 CET

Hi list,

I have a copy of an open source project in my svn repository on which
I'm developing some other features.
Sometimes, I want to synchronize my svn repository with the official one.
So with tortoise (1.4.0 build 7501 - 32 bit), I select the Merge feature
on my workingcopy, and indicate that in the merge box :

    * From : <official trunk>
    * Revision : <last revision of the official trunk I've merged
    * *Ignore ancestry checked*
    * Use "From:" URL checked
    * Head Revision

Then, tortoise merge the file deletions, the file updates, but if there
were a "copyfrom-url" command on the official trunk, then I got that
sort of error :
Error: Copyfrom-url
'http://subversion.magnolia.info/svn/magnolia/trunk/magnolia-module-admininterface/src/main/java/info/magnolia/module/admininterface/SimpleContentModule.java'
has different repository root than
'http://svn.my_company.com/svn/project_name'

So my question is : "Is the 'ignore ancestry' feature works ?"

Thanks,
    Anthony
Received on Wed Nov 15 18:59:23 2006

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.