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

Re: Merge problem

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-09-15 19:19:13 CEST

On Sep 15, 2005, at 12:00 PM, Gale, David wrote:
>
> Incidentally, I found the examples in this section of the book (and
> the
> later reference listing for svn merge) to be somewhat confusing, as
> they
> assume that you're in a working copy of the trunk, without stating
> that
> that's where you need to be.

Can you be more specific? I don't see where we assume this, but
don't state it. For example, in the chapter 4 section called
"merging a whole branch to another", the example actually shows
cd'ing into trunk, and the preceding text says:

"So to receive the changes, you need to have a working copy of the
trunk. We'll assume that either you still have your original one
lying around (fully updated), or that you recently checked out a
fresh working copy of /calc/trunk."

Which example is unclear?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 15 19:21:36 2005

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