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

Re: Merge problem

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-09-15 11:50:29 CEST

On Sep 15, 2005, at 09:39, Anthony Muller wrote:

> I have a merge problem:
>
> I'm working in a branch. I add a new file in this branch. I commit
> the file in the repository.
>
> I switch to trunk and afterwards I merged the branch on the trunk.
>
> The problem is that I can't commit the result to the trunk. I get
> the following error:
>
> svn: Source URL
> 'svn://elcano.hyperoffice.fr/java/branches/dynamicdesignmodel/
> fr.hyperoffice.ho/src/fr/hyperoffice/ho/lang/
> AbstractRetryException.java' concerns a different repository.

I think we're going to need more information, like a transcript of
the commands you executed, specifically how you switched your branch
working copy into a trunk working copy, how you performed the merge,
and how you then tried to commit it.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 15 11:52:27 2005

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