From 5c28913e6a3747f54d8ad6b3d910c5852eb368e3 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 24 Dec 2005 18:37:17 +0000
Subject: [PATCH] Update why unified diff is _sometimes_ better.
---
doc/FAQ_DEV | 5 +++--
doc/src/FAQ/FAQ_DEV.html | 6 ++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/doc/FAQ_DEV b/doc/FAQ_DEV
index 78974070284..5aca07b4a53 100644
--- a/doc/FAQ_DEV
+++ b/doc/FAQ_DEV
@@ -1,7 +1,7 @@
Developer's Frequently Asked Questions (FAQ) for PostgreSQL
- Last updated: Tue Nov 22 10:17:51 EST 2005
+ Last updated: Sat Dec 24 13:36:54 EST 2005
Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
@@ -110,7 +110,8 @@ General Questions
Generate the patch in contextual diff format. If you are unfamiliar
with this, you might find the script src/tools/makediff/difforig
- useful.
+ useful. Unified diffs are only preferrable if the file changes are
+ single-line changes and do not rely on the surrouding lines.
Ensure that your patch is generated against the most recent version of
the code. If it is a patch adding new functionality, the most recent
diff --git a/doc/src/FAQ/FAQ_DEV.html b/doc/src/FAQ/FAQ_DEV.html
index 1a08888e463..3cb29b016a6 100644
--- a/doc/src/FAQ/FAQ_DEV.html
+++ b/doc/src/FAQ/FAQ_DEV.html
@@ -13,7 +13,7 @@
<H1>Developer's Frequently Asked Questions (FAQ) for
PostgreSQL</H1>
- <P>Last updated: Tue Nov 22 10:17:51 EST 2005</P>
+ <P>Last updated: Sat Dec 24 13:36:54 EST 2005</P>
<P>Current maintainer: Bruce Momjian (<A href=
"mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</A>)<BR>
@@ -158,7 +158,9 @@
<P>Generate the patch in contextual diff format. If you are
unfamiliar with this, you might find the script
- <I>src/tools/makediff/difforig</I> useful.</P>
+ <I>src/tools/makediff/difforig</I> useful. Unified diffs are
+ only preferrable if the file changes are single-line changes and
+ do not rely on the surrouding lines.</P>
<P>Ensure that your patch is generated against the most recent
version of the code. If it is a patch adding new functionality, the
--
GitLab