You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Christian van der Leeden <li...@logicunited.com> on 2003/01/16 13:23:34 UTC
merge changes between trunk and a "branch" (or copy)
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
I've attached a script file to show the exact output.
The commands execute are : (head url is at the beginning
http://svn:8080/tags/safenet/R35)
svn merge http://svn:8080/tags/safenet/R35 http://svn:8080/trunk
/safenet
svn -R resolve .
svn switch http://svn:8080/trunk/safenet
Is this a valid way to merge changes from a branch into the trunk?
CU
Christian
Re: merge changes between trunk and a "branch" (or copy)
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On Friday, January 17, 2003, at 07:20 AM, Christian van der Leeden
wrote:
> Hi,
>
> ok, I've followed your instructions and it works fine :-)
>
> Now as an addition :-) How do I figure out the
> BEGIN_CHANGES? I've had a comment inside
> the log and could figure out the changes.
>
> How would I otherwise determine the BEGIN_CHANGES,
> the revision when I've done the svn copy?
at the moment, that's how you do it. keep track of what changes you
made to the branch via log entries or post-it notes or whatever.
later, svn will probably keep track of this information itself so that
it can provide better merge support, but it doesn't yet.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: merge changes between trunk and a "branch" (or copy)
Posted by Christian van der Leeden <li...@logicunited.com>.
Hi,
ok, I've followed your instructions and it works fine :-)
Now as an addition :-) How do I figure out the
BEGIN_CHANGES? I've had a comment inside
the log and could figure out the changes.
How would I otherwise determine the BEGIN_CHANGES,
the revision when I've done the svn copy?
Christian
On Friday, January 17, 2003, at 02:23 AM, Garrett Rooney wrote:
> 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
>
>
----------------------------------------------
Christian van der Leeden
Logic United GmbH
Tel: 089-189488-66 Mob: 0163-3747111
www.logicunited.com
Re: merge changes between trunk and a "branch" (or copy)
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
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