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

Re: merge changes between trunk and a "branch" (or copy)

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2003-01-17 02:23:42 CET

On Thursday, January 16, 2003, at 08:23 AM, Christian van der Leeden
wrote:

> Hi,
>
> ok, I've created a branch /tags/safenet/R35
> off the tree /trunk/safenet. Now I want to merge the changes
> of R35 into the trunk. On the R35 I do a merge and
> then a switch to the trunk. The switch to the trunk doesn't
> work due to:
> svn: Can't find a working copy path
> svn: open_props: path 'webserver/orgazmik/app/redirect.html' not found
>

if i understand you correctly, you want to do something like this.

1) check out trunk.

2) merge the changes you made on /tags/safenet/R35 into your working
copy.

3) resolve any conflicts.

4) commit.

so:

$ svn co http://svn:8080/trunk wc
$ cd wc
$ svn merge -r BEGIN_CHANGES:END_CHANGES
http://svn:8080/tags/safenet/R35
  [ ... ] resolve conflicts
$ svn resolve --recursive .
$ svn commit

note that BEGIN_CHANGES and END_CHANGES are the beginning revision and
end revision of the modifications you made to the branch (don't worry
if there are other unrelated revisions in there, it'll only look at the
ones that changed the branch).

you can find more on merging (probably giving a better explanation than
i can) in the subversion book at http://svnbook.red-bean.com/.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 17 02:24:36 2003

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