473,796 Members | 2,538 Online
Bytes | Software Development & Data Engineering Community
+ Post

Home Posts Topics Members FAQ

"patch" like tool

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.
Nov 14 '05 #1
3 1374
Pascal wrote:
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 ?
Yes.
Do you know an other way to proceed ?


No. What is your question about the C language?
Nov 14 '05 #2
Pascal wrote:
please let me explain the situation.

we're a software developement company, with about 30 people coding in C
under MS Visual C++ Studio.
Well, there is your first mistake. A big one, too.

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)
Another big mistake. Version control software can only help you so
much. The rest is up to you and how disciplined you are. If you have
so many branches it would be better to just manage them as seperate
projects.

Now, what does any of this have to do with the C language?
Am I clear enought ?
Absolutely. And I will tell you I've seen career's ruined because of
just these situations.
Do you know an other way to proceed ?


I just told you. Seperate projects.
Nov 14 '05 #3
On Thu, 24 Mar 2005 03:49:33 GMT,
Stan Milam <st*****@swbell .net> wrote
in Msg. <hN************ *****@newssvr12 .news.prodigy.c om>
I just told you. Seperate projects.


And go to a programmer's newgroup.

--Daniel
Nov 14 '05 #4

This thread has been closed and replies have been disabled. Please start a new discussion.

Similar topics

33
3034
by: Steven Bethard | last post by:
I feel like this has probably been answered before, but I couldn't find something quite like it in the archives. Feel free to point me somewhere if you know where this has already been answered. I have a list in a particular order that I want to split into two lists: the list of every nth item, and the list of remaining items. It's important to maintain the original order in both lists. So the first list is simple:
2
1542
by: Skip Montanaro | last post by:
I updated the patch that supports PEP 304, "Controlling Generation of Bytecode Files" to apply cleanly against current CVS. I've tested it on Mac OS X (straight Unix build only). I'd appreciate it if some Linux, Windows and Mac framework folks could apply the patch, rebuild, then run the tests (there is a "testbcb" target in the Makefile that should give Windows people an idea what to do). The patch is attached to ...
2
2900
by: Gary D. Rezek | last post by:
Hi All, First of all I'm mostly an MS Access guy (and novice learning MSSQL guy) and put on this project because of personnel changes, etc and because of db experience. I've only been doing this for about 2 months. I need to know how to "force" a download (patch) from an ASP page. I am developing an on-line internet registration page for students in the Residence Halls. Part of this project is getting their Res Hall/room number/port, MAC...
99
6249
by: Jim Hubbard | last post by:
It seems that Microsoft not only does not need the classic Visual Basic developer army (the largest army of developers the world has ever seen), but now they don't need ANY Windows developer at a small or mid-sized business. http://groups-beta.google.com/group/microsoft.public.msdn.general/browse_thread/thread/9d7e8f9a00c1c7da/459ca99eb0e7c328?q=%22Proposed+MSDN+subscription+changes%22&rnum=1#459ca99eb0e7c328 Damn! To be that...
8
5031
by: John Blair | last post by:
Hi, I updated the latest .Net patch on my system this moring and now my SQL Web Data Administrator application is not working. I get the following error: Server Application Unavailable The web application you are attempting to access on this web server is currently unavailable. Please hit the "Refresh" button in your web browser to retry your request.
28
3010
by: john_sips_tea | last post by:
Just tried Ruby over the past two days. I won't bore you with the reasons I didn't like it, however one thing really struck me about it that I think we (the Python community) can learn from. Ruby has ... an issue with docs. That is to say, there are almost none. Well, actually, there are some. For example, the "PickAxe" book (google it), and "Why's" Poignant Guide. But there's a disturbing lack of *built-in* docs for Ruby. Now, the...
0
361
by: Kurt B. Kaiser | last post by:
Patch / Bug Summary ___________________ Patches : 378 open ( +3) / 3298 closed (+34) / 3676 total (+37) Bugs : 886 open (-24) / 5926 closed (+75) / 6812 total (+51) RFE : 224 open ( +7) / 227 closed ( +7) / 451 total (+14) New / Reopened Patches ______________________
2
2156
by: djoefish | last post by:
sequel to the topic "install patch on windows"..... I am currently running Python2.3 with Enthought on a windows PC. I have been running into a memory problem (see http://evanjones.ca/python-memory-part3.html), and would like to install a patch. I have read a lot about it online, but can't seem to find out how to do so on windows. I have a 'patch' program that works, but it only patches the source file 'obmalloc.c', which does not...
3
6018
by: Larry Leonard | last post by:
Running MSDE 2000 SP2 on Windows XP SP3. I have a T-SQL script that is relatively simple (adding constraints, inserting rows, etc.) and short (maybe 300 lines, heavily commented). It's an upgrade script I wrote weeks ago, and has worked fine everywhere. After the patch from last Wednesday. "Security Update for SQL Server 2000 Service Pack 4 (KB948110)", I have gotten the following error on two different machines, using a copy of the...
0
9530
by: Hystou | last post by:
Most computers default to English, but sometimes we require a different language, especially when relocating. Forgot to request a specific language before your computer shipped? No problem! You can effortlessly switch the default language on Windows 10 without reinstalling. I'll walk you through it. First, let's disable language synchronization. With a Microsoft account, language settings sync across devices. To prevent any complications,...
0
10459
Oralloy
by: Oralloy | last post by:
Hello folks, I am unable to find appropriate documentation on the type promotion of bit-fields when using the generalised comparison operator "<=>". The problem is that using the GNU compilers, it seems that the internal comparison operator "<=>" tries to promote arguments from unsigned to signed. This is as boiled down as I can make it. Here is my compilation command: g++-12 -std=c++20 -Wnarrowing bit_field.cpp Here is the code in...
0
10236
jinu1996
by: jinu1996 | last post by:
In today's digital age, having a compelling online presence is paramount for businesses aiming to thrive in a competitive landscape. At the heart of this digital strategy lies an intricately woven tapestry of website design and digital marketing. It's not merely about having a website; it's about crafting an immersive digital experience that captivates audiences and drives business growth. The Art of Business Website Design Your website is...
1
10182
by: Hystou | last post by:
Overview: Windows 11 and 10 have less user interface control over operating system update behaviour than previous versions of Windows. In Windows 11 and 10, there is no way to turn off the Windows Update option using the Control Panel or Settings app; it automatically checks for updates and installs any it finds, whether you like it or not. For most users, this new feature is actually very convenient. If you want to control the update process,...
0
10017
tracyyun
by: tracyyun | last post by:
Dear forum friends, With the development of smart home technology, a variety of wireless communication protocols have appeared on the market, such as Zigbee, Z-Wave, Wi-Fi, Bluetooth, etc. Each protocol has its own unique characteristics and advantages, but as a user who is planning to build a smart home system, I am a bit confused by the choice of these technologies. I'm particularly interested in Zigbee because I've heard it does some...
0
9055
agi2029
by: agi2029 | last post by:
Let's talk about the concept of autonomous AI software engineers and no-code agents. These AIs are designed to manage the entire lifecycle of a software development project—planning, coding, testing, and deployment—without human intervention. Imagine an AI that can take a project description, break it down, write the code, debug it, and then launch it, all on its own.... Now, this would greatly impact the work of software developers. The idea...
1
7552
isladogs
by: isladogs | last post by:
The next Access Europe User Group meeting will be on Wednesday 1 May 2024 starting at 18:00 UK time (6PM UTC+1) and finishing by 19:30 (7.30PM). In this session, we are pleased to welcome a new presenter, Adolph Dupré who will be discussing some powerful techniques for using class modules. He will explain when you may want to use classes instead of User Defined Types (UDT). For example, to manage the data in unbound forms. Adolph will...
0
5445
by: TSSRALBI | last post by:
Hello I'm a network technician in training and I need your help. I am currently learning how to create and manage the different types of VPNs and I have a question about LAN-to-LAN VPNs. The last exercise I practiced was to create a LAN-to-LAN VPN between two Pfsense firewalls, by using IPSEC protocols. I succeeded, with both firewalls in the same network. But I'm wondering if it's possible to do the same thing, with 2 Pfsense firewalls...
1
4120
by: 6302768590 | last post by:
Hai team i want code for transfer the data from one system to another through IP address by using C# our system has to for every 5mins then we have to update the data what the data is updated we have to send another system

By using Bytes.com and it's services, you agree to our Privacy Policy and Terms of Use.

To disable or enable advertisements and analytics tracking please visit the manage ads & tracking page.