LinuxQuestions.org
Did you know LQ has a Linux Hardware Compatibility List?
Go Back   LinuxQuestions.org > Forums > Linux Forums > Linux - Software
User Name
Password
Linux - Software This forum is for Software issues.
Having a problem installing a new program? Want to know which application is best for the job? Post your question in this forum.

Notices

Reply
 
Search this Thread
Old 02-09-2005, 12:21 AM   #1
rylan76
Senior Member
 
Registered: Apr 2004
Location: Potchefstroom, South Africa
Distribution: Fedora 17 - 3.3.4-5.fc17.x86_64
Posts: 1,477

Rep: Reputation: 87
How does CVS conflicts work & howto fix?


Hi guys

I am trying to implement CVS in my current project. However, I sometimes get "conflicts" with it. We are only two developers, and yesterday it "conflicted" on a file that one of us changed, adding one function.

How do I fix a "conflict"? What is it? The file in question is now trahsed, missing functions, etc. and won't compile. It appears that the conflict somehow altered the file, making it unusable.

How do you hande conflicts with CVS? It places =====> tags around innocuous lines that are NOT those added, and that have been in the file for weeks. Why does it do this? How do I fix it?

Thanks
 
Old 02-09-2005, 06:46 AM   #2
Seagull
Member
 
Registered: Oct 2003
Location: Holland
Distribution: SuSE 10.0 SuSE 10.2
Posts: 70

Rep: Reputation: 15
Conflict - occurs when you've changed a file and attempted to book it back into the CVS repository while the version you've changed is not the current version. IE there's a newer version already in CVS.

CVS will place >>> type of markers around what it believes is the code causing the conflict. There should be two sets of these identifiers, one for the version you're trying to check in and one for the version already in the repository.

Resolve by checking the code between these markers and removing the bits that are no longer relevant, along with the markers. You will then need to test if it compiles and book the new file into CVS.

CVS is easy to use, however it requires the developers to make sure they use the system effectively and correctly.

Hope this helps.
Chris
 
Old 02-09-2005, 06:46 AM   #3
drisay
Member
 
Registered: Sep 2004
Distribution: Slackware 10
Posts: 167

Rep: Reputation: 30
cvs will handle conflicts by adding the =====> and similar signs around the new and old code. it's up to you to determine which to implement and which to remove.

<<<<<<< filename.extension
your recent changes here
=======
the changes submitted since you've edited your file
>>>>>>> 1.2

one way to work around these conflicts is to lock your files through cvs when editing them.
 
Old 02-10-2005, 01:59 AM   #4
rylan76
Senior Member
 
Registered: Apr 2004
Location: Potchefstroom, South Africa
Distribution: Fedora 17 - 3.3.4-5.fc17.x86_64
Posts: 1,477

Original Poster
Rep: Reputation: 87
Thanks guys! Now I know exactly what to do.

Apprecations,
 
  


Reply


Thread Tools Search this Thread
Search this Thread:

Advanced Search

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is Off
HTML code is Off


Similar Threads
Thread Thread Starter Forum Replies Last Post
Howto fix wget caused segfaultss? suguru Linux - Software 2 10-12-2005 12:57 PM
Japanese canna won't work : Warning: &#12363;&#12394;&#28450;&#23383;&#22793;&am OrganicOrange84 Debian 3 06-30-2005 02:28 PM
?simple CVS configuration howto pudhiyavan Linux - Software 0 01-06-2004 03:49 AM
howto a window fix on background ? leukozyt Linux - General 2 11-13-2003 04:41 AM
howto setup Cable modem&router&red hat on machine with ethernet integrated on mobo&XP takanana Linux - Networking 14 10-23-2003 07:20 AM


All times are GMT -5. The time now is 04:09 AM.

Main Menu
My LQ
Write for LQ
LinuxQuestions.org is looking for people interested in writing Editorials, Articles, Reviews, and more. If you'd like to contribute content, let us know.
Main Menu
Syndicate
RSS1  Latest Threads
RSS1  LQ News
Twitter: @linuxquestions
identi.ca: @linuxquestions
Facebook: linuxquestions Google+: linuxquestions
Open Source Consulting | Domain Registration