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

Re: Modifications to moved files

From: Juanma Barranquero <jmbarranquero_at_wke.es>
Date: 2004-02-17 15:40:18 CET

On Tue, 17 Feb 2004 09:12:19 -0500
Jack Ivey <ivey@altair.com> wrote:

> You could rename the modified file(s), update, poke around
> the workspace or log to find the new location then manually merge
> and commit the changes. Is this the best way?

More or less. You can do:

svn diff asdf.txt > asdf.txt.diff
svn revert asdf.txt
svn update
patch asdf-new.txt < asdf.txt.diff # or equivalent
svn commit asdf-new.txt -m "Gotcha!"


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 17 15:40:38 2004

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.