[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: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-10-07 20:00:46 CEST

On Oct 7, 2005, at 19:41, Paul Koning wrote:

>> "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."
> Wow. That is so very clear -- much more so than the explanation from
> "svn help merge".

Glad it helped! It is a simplification of course.... it's only the
first case covered by "svn help merge". There are other possible
syntaxes. The one I most often end up using, for example, to
propagate a change from the trunk to a release branch, is "svn merge -
r N:M A C" where you don't specify separate sources A and B, but a
single source A and two revisions N and M to compare. And again C is
optional and defaults to the current directory.

I think the most important information from "svn help merge"—the
description of the command: "Apply the differences between two
sources to a working copy path"—is getting lost because it's just a
single line squished in at the top, and it's overpowered visually by
all the extra relatively less-important information about the various
syntaxes below it.

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:03:26 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.