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

Re: [BOOK] Error in description of merge?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-01-13 18:13:39 CET

On Jan 13, 2005, at 11:02 AM, Simon Large wrote:

> If I understand correctly, the 2 URLs are shown reversed in the svn
> merge command: You want to merge the differences between trunk (old)
> and
> branch (new) into trunk WC.

Whoops! Thanks for spotting, I'll fix.

> In the reference section on merge, there is no indication of parameter
> order, although you might guess that it follows the same pattern as
> diff.

There's indication of parameter order... there's discourse about
comparing two trees, the "left" and "right" tree, and even discussion
about using 'svn diff' to preview merges.

> The version of the book shipping with 1.1.2 (Windows distribution) does
> not contain the 'Common Branching Patterns' section at all - is it a
> recent change, or is the Windows help file not building correctly.

It only came into existence last weekend. :-)

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 13 18:16:19 2005

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

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