[SLE] diff / patch problems..

From: Anders Norrbring (lists_at_norrbring.se)
Date: 09/29/04

  • Next message: Rainer Lay: "Re: [SLE] rc.local, but how in Suse?" 
    To: "'SuSE List'" <suse-linux-e@suse.com>
Date: Wed, 29 Sep 2004 17:30:55 +0200

    I'm about to make a patch for distribution, but I can't seem to get things
    right with the diff / patch pair.

    I have 2 directory structures where there are some changed files and also
    some new files in the "resulting" tree.

    So, I tried 'diff -Naur old new' and that part succeeded, but when I try to
    apply the patch, it creates the first missing file, but not where it should
    be... It's created in the directory where I ran 'patch < patch.diff'

    Then it borked on the next file, it's a file with changes.. Patch complains
    that it can't find the file at all.

    I also tried to edit the diff file header from looking like;
    --- ./old/lang/Dan/def_prefs.php 1970-01-01 01:00:00.000000000 +0100
    +++ ./new/lang/Dan/def_prefs.php 2004-09-29 16:25:35.000000000 +0200

    To look like;
    --- ./lang/Dan/def_prefs.php 1970-01-01 01:00:00.000000000 +0100
    +++ ./lang/Dan/def_prefs.php 2004-09-29 16:25:35.000000000 +0200

    That came up exactly the same. First created file in the wrong place and the
    next that should be changed couldn't be found.

    Any ideas on how I can fix my problem?

    Anders. 

    -- 
Check the headers for your unsubscription address
For additional commands send e-mail to suse-linux-e-help@suse.com
Also check the archives at http://lists.suse.com
Please read the FAQs: suse-linux-e-faq@suse.com
  • Next message: Rainer Lay: "Re: [SLE] rc.local, but how in Suse?"

    Relevant Pages

    • Success! was Re: tvtime audio vs pcHDTV-3000 card and pvHDTV-1.6 software
      ... On Wednesday 16 March 2005 20:15, Gene Heskett wrote: ... > that a diff actually outputs only the src code differences, ... nor in that simple little 10 line patch that ... >Unforch, the 2.6.11 plain tree has not, in this case been built yet ...
      (Linux-Kernel)
    • Re: how to compile and install a new driver
      ... Warren Block wrote: ... but you'd better include enough info so that they could make FreeBSD-stype diffs: diff has the unfortunate default of making an output that is compatible with ed. ... This supplies extremely little information to use, in case the file you're trying to patch with that diff has changed, and is also damned hard for mere humans to understand. ... then you can compile. ...
      (freebsd-questions)
    • [PATCH][CFT] mm swapping improvements
      ... Nikita's patches and one of my own, and backs out the RSS limit patch ... diff -puN include/linux/mmzone.h~rollup include/linux/mmzone.h ... -int FASTCALL); ...
      (Linux-Kernel)
    • Re: Reading and applying patches
      ... It's worth mentioning that patch is pretty forgiving. ... text up to the actual patch data (the output of a diff command, ... often the "old" tree will be inside ... Commands like "cvs diff" will generate diff output, ...
      (Fedora)
    • Re: TCP listenall
      ... of the patch is at the end of this email. ... retrieving revision 1.40 ... diff -u -r1.370 tcp_input.c ...
      (freebsd-net)