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

Re: "Skipped missing target" merging back to trunk

From: spinn <spinn_at_spinnwebe.com>
Date: 2005-10-07 19:58:55 CEST

On Oct 7, 2005, at 12:27 PM, Ryan Schmidt wrote:

> On Oct 7, 2005, at 18:16, spinn wrote:
>> Wait a minute...okay, I've gotten myself confused again.
>> ...etc...
> Where does it say to do it that way? You're right, that's backwards.
> "svn merge A B C" means "make a set of instructions that convert A
> into B, and perform the instructions on C." If you don't specify C,
> it means "the working copy I'm in right now." So what you want to
> do is take the set of changes that exist between trunk and the
> branch, and apply them to a working copy of trunk.
> svn merge svn://server/trunk_at_1234 svn://server/branches/
> branch@1234 /path/to/working/copy/of/trunk
> You probably shouldn't specify HEAD there either, and should
> instead use the specific revision of trunk that you merged to the
> branch. Otherwise somebody else could commit additional work to
> trunk in the mean time, and your merge would then have the effect
> of undoing those changes, which would be bad.

Ah! Well, that cleared it up for me to check: it's because the
printed copy of the docs I made a while back say to do it the wrong
way. Apparently that's been fixed in the docs since then. That'll
teach me to be old-school.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 7 20:01:04 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.