On 9/15/05, Christopher Ness <chris@nesser.org> wrote:
> 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.
>
Merge will handle the adding for you.
> > 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.
>
svn merge will currently not give you an error if you merge a change
from one repository to a working copy from another, but the subsequent
commit will fail. Does svn info in the branch you were working in
and the working copy you used to merge give the same repository
information. If not this is the problem.
This can happen erroneously on Windows machines if the URLs
written to the files happen to differ by case. This can be fixed with
svn switch --relocate to change the Url so they match.
If neither of these fix the problem, then send the exact commands
you used, that will give us more information.
Josh
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 15 23:09:28 2005