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

Re: Merge not merging

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-01-23 03:37:13 CET

On Jan 22, 2005, at 8:03 PM, matthew ford wrote:

> Hi
> I have exported a trunk and a branch and imported them to a new repos
> now I want to merge the changes from the branch to the trunk.

Were the two trees identical?

Either way, if you want to duplicate branch changes on the trunk, you'd
need to tell the merge command to generate a patch by comparing two
trees; the patch should describe just the branch changes.

Assuming that the branch began life as a copy of the trunk, this diff
would be generated by comparing the trunk with the branch, right? That
would produce a patch showing the branch changes. And it looks like
you've got your comparison backwards.

>
> How do I do that?
>
> svn diff svn://localhost/svnRepos/branch svn://localhost/svnRepos/trunk
>
> shows what I would expect but
>

Ah, okay, so they're not identical. You can see the differences.

> svn merge svn://localhost/svnRepos/branch
> svn://localhost/svnRepos/trunk

Are you running this command inside a working copy of the trunk or the
branch?

Either way, show us a transcript of your exact commands and their
output.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 23 03:40:48 2005

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