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

Re: correct svn merge

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-04-28 21:29:58 CEST

solo turn <soloturn99@yahoo.com> writes:

> personally i'm lacking:
> - clear, concise (short!) documentation
> (in book and "svn help merge")

Seriously, is 'svn help merge' not short and clear? The very first
thing it says is:

merge: apply the differences between two sources to a working copy path.
usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
        2. merge -r N:M SOURCE [WCPATH]

And yet in all your attempts to use 'svn merge', you never specified
two sources. Philip had to tell you to do this.

> - example for the "typical" case:
> branch an issue, and merge the result later.
> (in book)

I'll take this as constructive criticism. Chapter 4 of the book
*does* give an example of how to port a change from one branch to
another. But yes, we should probably generalize the example into this
most common use-case. I'll add it to the to-do list for the book.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 28 21:31:47 2003

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.