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

Re: Applying the results of svn diff to a disconnected repository

From: Olivier Sannier <obones_at_free.fr>
Date: 2006-08-24 19:02:23 CEST

Olivier Sannier wrote:
> Ryan Schmidt wrote:
>> On Aug 21, 2006, at 19:14, Olivier Sannier wrote:
>>> I can get the difference between two revisions with this command:
>>> svn diff --revision 1234:head http://url/to/repos/trunk/
>>> Using redirection, I get a file containing the differences.
>>> When moving to an offline location, I take this file with me and I'm
>>> trying to apply those differences to the locally kept files.
>>> But what command should I use?
>>> I tried with the standalone "patch" command, but it seems it does
>>> not recognize the format.
>>> Any ideas, anyone?
>> svn diff should be producing standard diffs, which should be usable
>> by the standard patch program, AFAIK. What message do you get when
>> you try this?
> Here is the output I get from "patch -i patchfile.diff":
> can't find file to patch at input line 5
> Perhaps you should have used the -p or --strip option?
> The text leading up to this was:
> --------------------------
> |Index: run/JvGrids.pas
> |===================================================================
> |--- run/JvGrids.pas (r├®vision 10887)
> |+++ run/JvGrids.pas (r├®vision 10898)
> --------------------------
> File to patch:
> Skip this patch? [y]
> Skipping patch.
> 1 out of 1 hunk ignored
> And the "patch --version" call gives this:
> patch 2.5
> Copyright 1988 Larry Wall
> Copyright 1997 Free Software Foundation, Inc.
> This program comes with NO WARRANTY, to the extent permitted by law.
> You may redistribute copies of this program
> under the terms of the GNU General Public License.
> For more information about these matters, see the file named COPYING.
> written by Larry Wall with lots o' patches by Paul Eggert
> This is the patch.exe from the UnxUtils package, under windows. I also
> tried with the one from MinGW, same result. I also tried with the -n
> option, it complains that there is only garbage in the file.
> Thanks for any pointers
Anyone ?

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 24 19:05:03 2006

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.