"patch" like tool

From: Pascal (_at_)
Date: 03/24/05 

Date: Thu, 24 Mar 2005 13:53:02 +0100

please let me explain the situation.

we're a software developement company, with about 30 people coding in C
under MS Visual C++ Studio. We have a source file system (Telelogic CM
Synergy, basicaly identical to cvs) that handle all the different versions
(it's a very huge tree)

Of course, we have very often the problem to report some modifications done
on a file to many other versions. This job is actually done manualy.

We tried to save time using the diff / patch pair, but it works only in half
of the cases. Explanations :

diff / patch works fine when you are on the same branch, linear sequence of
the same file, applying diff/patch to move from one version to the next one.

BUT, when you try to add a piece of code within a procedure where some lines
were also removed, patch failed to locate where to insert the new code.

Am I clear enought ?

Do you know an other way to proceed ?

Thanks for your help. 

-- 
Pascal R.
----------------------------------------------------------------------------
-------
There are only 10 types of people in this world...
those who understand binary, and those who don't.

Relevant Pages

  • "patch" like tool
    ... under MS Visual C++ Studio. ... We have a source file system (Telelogic CM ... We tried to save time using the diff / patch pair, but it works only in half ...
    (comp.lang.c)
  • 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: Regression from 2.6.26: Hibernation (possibly suspend) broken on Toshiba R500 (bisected)
    ... Attached is a full diff between dmesg from -rc3 and -rc6 with your debug ... running with the debug patch). ...
    (Linux-Kernel)