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

Re: how to merge working copy changes to other working copy file?

From: Sohail Somani <sohail_at_taggedtype.net>
Date: 2007-11-20 18:24:33 CET

On Tue, 20 Nov 2007 12:38:27 +0100, Momme Butenschön wrote:

> I might be a bit dumb, but I didn't find the answer in the book, so what
> I want to do is:
> I have two almost identical versions of a file in a repository and want
> to merge the changes I did to one of them to the other one, i. e. I
> would like to take the result of 'svn diff file1' and merge it to
> 'file2', however I couldn't figure out the svn merge command (without
> comiting the changes to the file1 one before). Any hint?

This is just simple diff + patch:

 $ svn diff file1 > file1.diff
 $ cd /path/to/file2
 $ mv file2 file1
 $ patch -p0 < /path/to/file1.diff

Sohail Somani
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 20 18:27:34 2007

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.