From: SF Markus Elfring <elfring@users.sourceforge.net>
To: Tim Waugh <twaugh@redhat.com>
Cc: patchutils-list@sourceware.org
Subject: Re: How to resolve hiccups by patch program?
Date: Thu, 04 Jan 2007 22:04:00 -0000 [thread overview]
Message-ID: <459D79D1.3010207@users.sourceforge.net> (raw)
In-Reply-To: <1167919453.4854.18.camel@cyberelk.elk>
> Need to see the file it's being applied to. Commonly a reject will be
> because the file the patch was made against is not the same as the file
> the patch is applied to.
>
Advanced matching algorithms (fuzz factor ...) are used by the patch
program. I wonder why my updates should not fit in this case.
> No -- you just need to create a clean patch in the first place, i.e. one
> that applies directly to the same file the developer is using. :-)
>
Do you know any other recommended tools to perform special consistency
checks on my side before I submit patches from the tool that I trusted
so far?
I do not see from the example reject file which lines were considered as
unclean and were the reason for the unexpected rejection. Can I convince
the patch program to accept the "suspicious" lines in a second run?
> It sounds like the tool you're using is generating the patch against a
> different revision that you intend.
I do not expect such a mismatch from the current TortoiseSVN software.
The generated patch file contains appropriate revision informations. Do
I overlook anything from my viewpoint?
http://en.wikipedia.org/wiki/Subversion
Regards,
Markus
next prev parent reply other threads:[~2007-01-04 22:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-04 8:04 SF Markus Elfring
2007-01-04 14:04 ` Tim Waugh
2007-01-04 22:04 ` SF Markus Elfring [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-01-05 12:08 SF Markus Elfring
2007-01-05 10:26 SF Markus Elfring
2007-01-05 11:21 ` Tim Waugh
2007-01-05 21:51 ` SF Markus Elfring
2007-01-06 15:03 ` SF Markus Elfring
2007-01-03 10:47 SF Markus Elfring
2007-01-03 12:43 ` Tim Waugh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=459D79D1.3010207@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=patchutils-list@sourceware.org \
--cc=twaugh@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).