Re: Merging and Ancestry

From: Ryan Schmidt <subversion-2006c_at_ryandesign.com>
Date: 2006-08-17 13:15:10 CEST

On Aug 17, 2006, at 10:37, Lakshman Srilakshmanan wrote:

> The problem I have is, Scenario 2 being the correct process, how do I
> merge a select set of files from /Branch/A into /Branch/B. Using
> r20:21
> is not possible as the test.txt may not be the only change in that
> revision.
>
> Is there an alternate way ?

Specify the revision range and the filename.

svn merge -r20:21 $REPO/project/branches/branch2/file.txt file.txt

Or something like that.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 17 13:16:53 2006

This message: [ Message body ]
Next message: Robin: "Fresh checkout causing Invalid diff stream: insn 16301 cannot be decoded"
Previous message: Johan Appelgren: "Re: Needs-lock setting automatically"
In reply to: Lakshman Srilakshmanan: "Merging and Ancestry"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]