Re: [patch] applying patch can fail with dry_run

2012-01-16 Thread Stefan Küng
On 16.01.2012 11:34, Philip Martin wrote: Philip Martin writes: Now I can reproduce the error. So the problem occurs when we have a patch file with one item that adds two levels of directories and another item that deletes a file: Index: wc/A/B/f

Re: [patch] applying patch can fail with dry_run

2012-01-16 Thread Philip Martin
Philip Martin writes: > Now I can reproduce the error. So the problem occurs when we have a patch file with one item that adds two levels of directories and another item that deletes a file: Index: wc/A/B/f === --- wc/A/B/f(rev

Re: [patch] applying patch can fail with dry_run

2012-01-16 Thread Philip Martin
Stefan Küng writes: > On 12.01.2012 22:34, Philip Martin wrote: >> Stefan Küng 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 >> --dr

Re: [patch] applying patch can fail with dry_run

2012-01-14 Thread Stefan Küng
On 12.01.2012 22:34, Philip Martin wrote: Stefan Küng 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

Re: [patch] applying patch can fail with dry_run

2012-01-12 Thread Philip Martin
Stefan Küng 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. -- uberSVN: Apache Subversion Made Easy http://www.uberSVN.com

Re: [patch] applying patch can fail with dry_run

2012-01-12 Thread Philip Martin
Stefan Küng writes: > I'm not sure how this is triggered exactly. If you check the mailing > list thread on the TSVN mailing list: > http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2899409 > you can see that both the working copy and the patch to reproduce the > issue a

Re: [patch] applying patch can fail with dry_run

2012-01-12 Thread Stefan Küng
On 12.01.2012 21:13, Philip Martin wrote: Stefan Küng writes: Question is: do we need the notifications for deleting empty dirs in a dry-run? If yes, then this get's complicated: the error is thrown from svn_wc_walk_status() called in check_dir_empty. I could just not call that function in cas

Re: [patch] applying patch can fail with dry_run

2012-01-12 Thread Philip Martin
Stefan Küng writes: > Question is: do we need the notifications for deleting empty dirs in a > dry-run? If yes, then this get's complicated: > the error is thrown from svn_wc_walk_status() called in > check_dir_empty. I could just not call that function in case of a > dry-run, or catch that speci

Re: [patch] applying patch can fail with dry_run

2012-01-12 Thread Stefan Küng
On 12.01.2012 20:07, Philip Martin wrote: Stefan Küng writes: Could someone please review my patch? I'm sure you guys can see immediately whether this is save or not. If it's ok, then I'll commit it later. Index: subversion/libsvn_client/patch.c ==

Re: [patch] applying patch can fail with dry_run

2012-01-12 Thread Philip Martin
Stefan Küng writes: > Could someone please review my patch? I'm sure you guys can see > immediately whether this is save or not. If it's ok, then I'll commit > it later. Index: subversion/libsvn_client/patch.c === --- subversion/lib

[patch] applying patch can fail with dry_run

2012-01-12 Thread Stefan Küng
Hi, When applying a patch in dry-run mode, svn can return an error even if the patching would work just fine. The returned error is then: The Node /newDirectory was not found If you want to reproduce this, here's the mailing list thread on the TSVN mailing list: http://tortoisesvn.tigris