Arch Linux

itti

Member

Registered: 2007-06-01

Posts: 67

[c++] merge code in 3 svn snapshots

hi,

i'm finishing a university project of mine and i've got problems with my sourcecode. its somewhat complicated. i have my code in svn repository a, this code is (partially) a fork of programm x in repository b. of course x was developed further over the last few months and so there is also a new revision of x, we may call c.

my strategy to bring my code and the official code of x in sync looks something like this:

diff a and b to get a list of files i changed
diff changed_files of a and c to get a list of "conflicts"
finally merge by hand...

doesn't look like an exciting thing to do. so the purpose of my post here is to find out if there is some kind of tool available in the open source world to help me merging the code?

Barrucadu

Member

From: Hull, England

Registered: 2008-03-30

Posts: 1,157

Website

Re: [c++] merge code in 3 svn snapshots

Patch would be what you're looking for, I think. I'm not sure exactly how it works, but it basically looks at the output of diff performed on the two files and adds the changes in.

---

Website | Blog

The Arch Hurd Project

wuischke

Member

From: Suisse Romande

Registered: 2007-01-06

Posts: 630

Re: [c++] merge code in 3 svn snapshots

First of all make sure that you understand the code. If not, it's going to be a mess.

Then I advise using a tool like meld or kdiff3 to merge the files graphically, it's imho the most comfortable and error-free way to do so.