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

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

From: Christian van der Leeden <lists_at_logicunited.com>
Date: 2003-01-16 14:23:34 CET

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

----------------------------------------------
Christian van der Leeden
Logic United GmbH
Tel: 089-189488-66 Mob: 0163-3747111
www.logicunited.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

  • application/octet-stream attachment: output
Received on Thu Jan 16 14:24:37 2003

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