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

Re: hiccups by patch program?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-01-03 19:34:02 CET

Markus Elfring wrote:
>> http://issues.tortoisesvn.net/?do=details&id=241
> The bug report "Create Patch can include two copies of the same file" seems to
> be interesting. But it might not be relevant in my case because the file
> "const4.patch" does not contain unexpected duplicates.
> http://bugs.digium.com/file_download.php?file_id=12617&type=bug

I haven't seen any duplicate entries either. So it must be something else.

> I can not see from the file "app_db.c.rej" the real reason for the rejection by
> the patch program. I recognise only my expected updates.
> http://bugs.digium.com/file_download.php?file_id=12652&type=bug

I don't know what patch tool they use. But this *.rej file is definitely
not a patch file which is valid in Subversion.
And TortoiseSVN (apart from the issue above with the duplicate entries)
creates perfectly fine patch files in unified diff format, the *very
same* as the Subversion command line client does (it uses the same
Subversion API to create them).

So if the patchfile got rejected, you have to ask why it was rejected
and what tool they're using. My best guess would be that your patch is
already outdated (i.e. not possible to apply to the latest version of
trunk because there were already too many changes).
If not, I can't really help you here...


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Jan 3 19:34:16 2007

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.