LinuxQuestions.org
Download your favorite Linux distribution at LQ ISO.
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 07-18-2005, 07:03 AM   #1
hylke
Member
 
Registered: Apr 2004
Location: the Netherlands
Distribution: Ubuntu 7.04
Posts: 329

Rep: Reputation: 30
subversion merge :-\


Hello,
I'm working with subversion for my project(Combat of Death), and I've made some changes to Menu.cpp but some other guy too, and he commited it faster than me.
So when i tried to commit I got a conflict with Menu.cpp(you know, the C before Menu.cpp).
So I thought, let's merge his shit in Menu.cpp using the merge thing from subversion.
So I did:
Code:
svn -r 71:HEAD Menu.cpp
I probably did some similiar things a couple of times, because my file is no 2600 lines, and it orignally was about 600 lines(it's repeated a lotta times).
But now I've gotta find the right one, because I also merged with version 69.
I now have lines like:
Quote:
>>>>>>> .merge-right.r71
and
Quote:
=======
In my file, So how do I know where to where I have to cut the code, so I don't lose my code at which I worked(debugt) so long?
Thanx Hylke
 
Old 07-19-2005, 02:40 AM   #2
jillande
Member
 
Registered: Oct 2003
Location: fargoh eh.
Distribution: slackware
Posts: 94

Rep: Reputation: 15
i'm not familiar with subversion doing merge in that fashion, only using merge to 'revert,' if you will.

i think a good route to go would be to run a 'diff' on version 70 and your working copy and then apply that patch to version 71 (this other guy's work). there might be some conflicts to manually resolve, (my guess is that there quite likely will be), but it shouldn't be too bad unless you and he made large quantities of changes.
 
Old 07-19-2005, 03:36 AM   #3
hylke
Member
 
Registered: Apr 2004
Location: the Netherlands
Distribution: Ubuntu 7.04
Posts: 329

Original Poster
Rep: Reputation: 30
Ok thanx.
(although I hoped for an easier solution)
Hylke
 
  


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
merge directories d-fens Linux - General 9 02-04-2010 05:48 PM
subversion varun_33 Linux - Software 1 04-20-2005 12:37 PM
Subversion and Apache BoonZie Linux - Software 0 11-27-2004 03:45 AM
subversion sethgeekx86 Slackware 8 07-26-2004 03:29 PM
How to install Subversion(Version Control with Subversion) under RedHat Linux. netkiller Linux - Networking 1 07-01-2004 05:45 AM


All times are GMT -5. The time now is 05:20 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