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

Re: [patch] applying patch can fail with dry_run

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Mon, 16 Jan 2012 09:43:08 +0000

Stefan Küng <tortoisesvn_at_gmail.com> writes:

> On 12.01.2012 22:34, Philip Martin wrote:
>> Stefan Küng<tortoisesvn_at_gmail.com> writes:
>>
>>> $ svn co https://triplea.svn.sourceforge.net/svnroot/triplea/trunk wc -r3375
>>> $ svn patch test.patch wc --dry-run
>>
>> No error on my machine, it would simply create wc/src, and does without
>> --dry-run.
>>
>
> why would a dry run create the folder? a dry-run must not change anything.

The --dry-run merge shows that it would create a directory src. If I
remove --dry-run it does create the directory. No errors.

> when I run
> svn patch --dry-run test.patch triplea
> I get the attached output.
>
> As you can see, the last line is the returned error I mentioned before.
> Using an svn client built from the latest 1.7.x branch.

So your output starts

A triplea\src\games\strategy\engine\framework\startup\ui\editors

While mine starts

A wc/src
A wc/src/games
A wc/src/games/strategy
A wc/src/games/strategy/engine
A wc/src/games/strategy/engine/framework
A wc/src/games/strategy/engine/framework/startup
A wc/src/games/strategy/engine/framework/startup/ui
A wc/src/games/strategy/engine/framework/startup/ui/editors

From which I deduce that the checkout/patch instructions were wrong. I
need to apply the patch to:
https://triplea.svn.sourceforge.net/svnroot/triplea/trunk/triplea
not:
https://triplea.svn.sourceforge.net/svnroot/triplea/trunk

Now I can reproduce the error.

-- 
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com
Received on 2012-01-16 10:44:01 CET

This is an archived mail posted to the Subversion Dev mailing list.