Re: uupdate and .rej files
On Wed, Apr 04, 2001 at 10:20:19PM +0200, Stefano Zacchiroli wrote:
> As some of you told me, I try to use uupdate with new upstream release.
> I know that uupdate try to apply the diff.gz patches to the new upstream
> versione and when I can't do it cleanly creates a .rej file.
>
> I can't understand what the .rej files really are.
> It seems to me that the corrisponding file (without .rej extensione) is
> not the origianl upstream version of the file nor the previous version
> one.
>
> And also, more important, what I have to do with a .rej file ?
> I guess that I have to integrate this file with the corrisponding file
> but I can't understand exactly what I have to look for ...
>
> Moreover, the package seems to work correctly even if I ignore the
> existence of .rej file, is it possible ?
Start by reading the patch(1) manpage.
uupdate attempts to apply all of the Debian diffs to the last upstream
version to the new upstream version. Those which succeed are used,
those which fail are saved to the .rej file(s). If you look at the
content of a .diff.gz file, you will find that it is made of a number
of "hunks", something like:
--- cweb-3.63.orig/cweb.1
+++ cweb-3.63/cweb.1
@@ -1,4 +1,4 @@
-.TH CWEB 1L 6/15/92
+.TH CWEB 1 6/15/92
.SH NAME
ctangle, cweave \- translate CWEB to C and/or TeX
.SH SYNOPSIS
Thus the patch to lines 1-4 is treated as one "hunk" and is handled
independently from any other diffs for this file.
So you should definitely look through all of the .rej files to see why
they have failed and whether or not they need to be applied to the new
version in a modified way.
Julian
--
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Julian Gilbey, Dept of Maths, Queen Mary, Univ. of London
Debian GNU/Linux Developer, see http://people.debian.org/~jdg
Donate free food to the world's hungry: see http://www.thehungersite.com/
Reply to: