pg.ddx.io pgsql-docs@postgresql.org mailing list archive
help / color / mirror / Atom feedInvoking patch
2+ messages / 2 participants
[nested] [flat]
* Invoking patch
@ 1999-06-21 14:42 Fred Wilson Horch <fhorch@ecoaccess.org>
0 siblings, 1 reply; 2+ messages in thread
From: Fred Wilson Horch @ 1999-06-21 14:42 UTC (permalink / raw)
To: Thomas Lockhart <lockhart@alumni.caltech.edu>; +Cc: pgsql-docs@hub.org
> > *** doc/src/sgml/history.sgml Sun Jun 20 21:53:53 1999
> > --- doc/src/sgml/history.sgml.new Sun Jun 20 21:58:24 1999
>
> How would you suggest I invoke the patch utility to get this to work?
This works for me:
1. save patch file to doc/src/sgml/history.sgml.patch
2. cd doc/src/sgml
3. patch < history.sgml.patch
On my system, this patches the history.sgml file. What happens when you
try it?
I'm using
$ patch --version
patch 2.5
Copyright 1988 Larry Wall
Copyright 1997 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.
written by Larry Wall with lots o' patches by Paul Eggert
$ uname -a
Linux devel.ecoaccess.org 2.0.36 #1 Thu Mar 4 15:18:55 EST 1999 i586
unknown
Let me know if you'd rather I save the original file to .orig rather
than create a .new file. Either way works for me.
--Fred Horch
P.S. Actually, now that I've got font-lock working with psgml mode, I
like keeping the .sgml extension on both files, so I call the new one
.new.sgml. I can cp the orig file to .orig.sgml just as easily.
The one thing about renaming the original files to .orig is that I get
confused when doing cvs updates. By keeping all of my changes in .new
files, it's clearer to me which of my changes made it into the official
Postgres repository. But again, I'll do whatever makes it easier for
you.
^ permalink raw reply [nested|flat] 2+ messages in thread
* Re: Invoking patch
@ 1999-06-22 06:03 Thomas Lockhart <lockhart@alumni.caltech.edu>
parent: Fred Wilson Horch <fhorch@ecoaccess.org>
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lockhart @ 1999-06-22 06:03 UTC (permalink / raw)
To: Fred Wilson Horch <fhorch@ecoaccess.org>; +Cc: pgsql-docs@hub.org
> > How would you suggest I invoke the patch utility to get this to
> > work?
> 1. save patch file to doc/src/sgml/history.sgml.patch
> 2. cd doc/src/sgml
> 3. patch < history.sgml.patch
Hmm. Somehow since it had the doc/src/sgml path in the names I put it
up in the top level directory, but it wasn't happy. Didn't try exactly
what you suggest. btw, I'm running the same version of patch as
yourself.
> The one thing about renaming the original files to .orig is that I get
> confused when doing cvs updates. By keeping all of my changes in .new
> files, it's clearer to me which of my changes made it into the
> official Postgres repository. But again, I'll do whatever makes it
> easier for you.
Well, easiest for me is probably filename.sgml.orig and filename.sgml,
just because that is the form for all of the other patches we get.
btw, you might want to use cvsup to pull over the CVS repository.
Then, you can easily diff and update your local working tree via local
cvs without the risk of blowing away any changes you might have made.
And cvs will show you which files have changed, even if you forget to
rename them or save a .orig version. The newest version of the docs
have an appendix on cvs/cvsup access.
- Thomas
--
Thomas Lockhart lockhart@alumni.caltech.edu
South Pasadena, California
^ permalink raw reply [nested|flat] 2+ messages in thread
end of thread, other threads:[~1999-06-22 06:03 UTC | newest]
Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
1999-06-21 14:42 Invoking patch Fred Wilson Horch <fhorch@ecoaccess.org>
1999-06-22 06:03 ` Thomas Lockhart <lockhart@alumni.caltech.edu>
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox