[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: Anthony Muller <Anthony.Mueller_at_hyperoffice.fr>
Date: 2005-09-15 09:39:46 CEST

Please help !

        -------- Message d'origine--------
        De: Anthony Muller
        Date: mer. 14/09/2005 18:26
        À: users@subversion.tigris.org
        Cc: Nicolas Benoist
        Objet: Merge problem
        
        

        Hello!
        
        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.
        
        Thanks for help!
        
        Regards,
        Anthony
        
        
        ---------------------------------------------------------------------
        To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
        For additional commands, e-mail: users-help@subversion.tigris.org
        
        
        
Received on Thu Sep 15 09:41:54 2005

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