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

Merging from a tag to a branch - Not working

From: Rule, Chris <Chris.Rule_at_tbe.com>
Date: 2005-05-12 00:49:27 CEST

AAHHHHHHHGGGGGGG! Sorry. I feel better now.
 
I'm trying to merge to a working copy from a tag and I can't figure out the
correct command to use even after attempting to digest both the subversion
book and the TortiseSVN help. Neither are clear enough to provide an answer.

Here's a snapshot of my repository:

/branch/
   branch1/
/tags/
   v12.00/
   v12.00r1/
   v12.00r2/
trunk/

The way tags/v12.00r2 was created:
   Copy tags/v12.00r1 to branch/v12.00r2.
   Create working copy from branch/v12.00r2.
   Make changes to working copy. Update repository.
   Copy branch/v12.00r2 to tags/v12.00r2.
   Delete branch/v12.00r2.
   
My working copy is based off of branch/branch1.

What I want is to merge any differences between v12.00r2 and my working copy
into my working copy.

I've tried various merge commands but none work. As in, I'm not getting all
the files that are different between v12.00r2 and branch1. For example, one
of the files in v12.00r2 was changed in revision r122, but I can't use r122
when referencing tags/v12.00r2 directory. I get the "svn: Cannot replace a
directory from within" error. I don't think I want to compare to the base
repository directory (/) because I don't want to get changes that have been
made to trunk. So I'm stuck.

Here's the logs from the two directories in question:

$ svn log --stop-on-copy svn://server/product/tags/v12.00r2 -q
------------------------------------------------------------------------
r129 | crule | 2005-05-11 13:32:02 -0500 (Wed, 11 May 2005)
------------------------------------------------------------------------
r124 | crule | 2005-05-09 12:56:06 -0500 (Mon, 09 May 2005)
------------------------------------------------------------------------

$ svn log --stop-on-copy svn://server/product/branch/branch1 -q
------------------------------------------------------------------------
r131 | crule | 2005-05-11 15:41:59 -0500 (Wed, 11 May 2005)
------------------------------------------------------------------------
r130 | crule | 2005-05-11 14:39:35 -0500 (Wed, 11 May 2005)
------------------------------------------------------------------------
r106 | crule | 2005-03-22 17:26:34 -0600 (Tue, 22 Mar 2005)
------------------------------------------------------------------------
r105 | crule | 2005-03-21 12:02:38 -0600 (Mon, 21 Mar 2005)
------------------------------------------------------------------------
r104 | crule | 2005-03-21 11:38:53 -0600 (Mon, 21 Mar 2005)
------------------------------------------------------------------------
r103 | crule | 2005-03-21 11:14:42 -0600 (Mon, 21 Mar 2005)
------------------------------------------------------------------------
r102 | crule | 2005-03-21 11:10:26 -0600 (Mon, 21 Mar 2005)
------------------------------------------------------------------------
r101 | crule | 2005-03-21 11:06:53 -0600 (Mon, 21 Mar 2005)
------------------------------------------------------------------------

I'm using
$ svn --version
svn, version 1.1.4 (r13838)
   compiled Apr 13 2005, 11:50:51

Repository is fsfs.

Any ideas?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu May 12 01:41:50 2005

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