> -----Original Message-----
> From: Kris Deugau [mailto:kdeugau@vianet.ca]
> Sent: Tuesday, September 11, 2007 12:48 PM
>
> Bicking, David (HHoldings, IT) wrote:
> > I am having a problem with what I thought was a very simple
> test. I
> > am attempting to merge a specific file in a branch into the trunk,
> > which also has that file. I changed both files such that
> at one place
> > there should be conflicting changes, and at another there are
> > non-conflicting changes. I simply modified some text which
> ended up similar to :
-- snip --
> I can't read your Word document (if you *must* create
> screenshots, please post them to public webspace somewhere as
> .jpg or .png images), but from the description you're
> tripping over the details of exactly how a merge works.
Yeah, well, I'm only allowed to use the software already installed on
this computer. I put it into Paint and got a 1.5M BMP file. I decided
Word was a better option at 29.5K. Don't you have Open Office? :P
>
> First, a question: Can you reproduce the problem with the
> command-line client?
Yes.
>
> Second, a guess as to what you're doing wrong:
>
> Instead of merging changes from r[n] to r[m] on the branch,
> to the current trunk, you're merging the changes from r[n] of
> the branch to r[m] of the trunk, into the trunk, so more or
> less by definition there are no conflicts.
Yep, that's exactly what I'm doing, where I'm merging the tip of each
codeline.
>
> Put another way, the "from" and "to" revision/path specifiers
> are used to create the diff, which is (usually) applied to
> the working copy in the current directory. (With the
> command-line client, you can specify an alternate directory
> path for the WC(-subpath) to operate on.)
I don't see how to do this either from the online help or the book. If I
understand correctly, you are saying I want to merge a range of changes
from the branch into trunk, via the workspace. In this case r47 through
r53 on the branch into the head of the trunk. If this is correct, now
do I specify the range? I see one revision number entry per branch.
If I read the instructions differently, it appears that I would locate
my client in the workspace of my trunk, then specify the range on the
branch, like this:
Cd /myworkspace
Svn merge -r 47:53 /MyRepos/MyProj/Branches/MyBranch
Would this then merge revisions between 47 and 53 into my workspace
copy, which is the updated trunk? Will it know based on the workspace
control files to look at trunk history? I'm going to give that a try
while I wait for an answer.
--
David
*************************************************************************
This communication, including attachments, is
for the exclusive use of addressee and may contain proprietary,
confidential and/or privileged information. If you are not the intended
recipient, any use, copying, disclosure, dissemination or distribution is
strictly prohibited. If you are not the intended recipient, please notify
the sender immediately by return e-mail, delete this communication and
destroy all copies.
*************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 11 20:08:47 2007