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

RE: Merging from a tag to a branch - Not working

From: Rule, Chris <Chris.Rule_at_tbe.com>
Date: 2005-05-12 14:31:33 CEST

This part I had already inferred from the existing documentation, though it
does do a better job of explaining it. Thanks!

However (knew that was coming, didn't you :-), it doesn't explain about the
revision numbers and how they interact with the merge command. My first
impulse would be to compare the HEAD of v12.00r2 with the HEAD of
branch/branch1, but there are several warnings in the books that this is not
what should be done, with the implication that it should never be done. The
impulse is there because my thinking of the revision number associated with
HEAD is related to the directory path being pointed to, e.g. the HEAD
revision number of tags/v12.00r2 is different that the head revision number
of branch/branch1. However, I do understand that by definition, HEAD is the
revision number of the entire repository independent of the path being
pointed to. While I don't like this definition, that seems to be the way it
is.

The major problem I have with merging my current setup is there was a change
done in tags/v12.00r1 that I can see if I pull out a separate working copy
of tags/v12.00r2, but I can't get that change to merge into my working copy
just using the svn commands comparing to tags/v12.00r2, but I should be able
to.

For reference, here's the repository layout again:

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

Working copy is current based off of branch/branch1.

-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]
Sent: Wednesday, May 11, 2005 6:44 PM
To: Rule, Chris
Cc: users@subversion.tigris.org
Subject: Re: Merging from a tag to a branch - Not working

On May 11, 2005, at 5:49 PM, Rule, Chris wrote:

>
> Any ideas?
>

Try reading this new section of the book, which de-mystifies the 'svn merge'
command:

    http://svnbook.red-bean.com/en/1.1/ch04s03.html#svn-ch-4-sect-3.2

See if it helps de-confuse.

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

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