Skip to content

Subversion Get Latest Version and its problems

November 25, 2012

Looking back at the last few days, checking out and checking in code using Subversion on very old code bases need care and thought on how it is executed, I still haven’t got to grips with it, and essentially I have copied old projects and keep them archived in case I needed them. That has proved to be useful, because if you know how to use Subversion on Visual Studio well, then you can branch out an old version and add new files to them on this separate branch, I hadn’t foreseen this and nor can I see this option on Subversion.

What I had encountered where many problems on having two separate code bases of the latest version of my project, and an old version of the code that I have kept separate for adding some new files and publishing it onto the server, I deliberately didn’t want to update to the latest version for this project as I know it has been fully tested and is working.

However for the other two projects, I had committed the latest code for one, but the other project receives many  merge conflicts upon getting the latest version! That project produce files with suffix names: *.merge-right.r5001, *.merge-left.r4501 and *.working!! There is no clear explanation in the svn documentation for this.

It turns out that after researching, that a branch had occurred at some point previously : –

File.merge-left.r4501 is the latest change of this file in the left branch (i.e. the origin) before the right branch (the destination) were created.

In other words, merge-left.r4501 it’s the first version of the file to be merged

with merge-right.r5001 (the latest version of the destination branch)

(So right had been a copy of the left previously at some point, and both files had been modified hence the merge conflicts)

You also get *.working which is the unchanged current file.

The thing you have to do is therefore is to manually change the working version to add the left or the right merge conflicts based on which you feel is the correct version!! If you see a lot of these changes, you haven’t committed the files frequently enough and a lot manual checking is needed! So commit often, and branch less frequently!

Advertisements

From → Uncategorized

Leave a Comment

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

%d bloggers like this: