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

Re: RE : Merge problem

From: Christopher Ness <chris_at_nesser.org>
Date: 2005-09-15 14:43:06 CEST

On Thu, 2005-09-15 at 09:39 +0200, 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.

If you add a new file to a branch you have to copy the new file over to
the trunk. The merge will not copy it over for you if I recall
correctly.
        
> 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.

Was this the file you added? Because trunk wouldn't know anything about
it and I'm not sure how the switch would react to a file that doesn't
exist on trunk yet.

Cheers,
Chris

-- 
PGP Public Key: http://www.nesser.org/pgp-key/
08:40:07 up 34 min, 2 users, load average: 0.06, 0.05, 0.07

Received on Thu Sep 15 14:44:34 2005

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