[Subclipse-users] Subversion workflow

Hi,

I have been using Eclipse with Subclipse and a SVN repository on my
server to track changes I make to various web sites I maintain. It works
very well and I'd be lost without it.

To date it has all been fairly simple stuff. However I am am stuck on
how to use it when the base software is upgraded.

e.g. I import Joomla version A in trunk. I then make changes to the code
and any changes are exported to the website. Joomla then release version B

I would like to be able view and choose to merge any changes that I made
from the old version to the new version.

I *thought* that I might be able to import the new version to a branch
and then merge any changes from the branch to the trunk but seem to
struggle with this and figure I am getting something badly wrong.

There is no one else working on the code - just little old me. Can
anyone give me an idea of how I should actually be doing this ???

I have read all over the show and am none the wiser. Most guides etc are
written from the point of a repository where the only development is on
the actual repository itself and no allowance seems to be made for my
type of system where I am making changes to a system which I need to
migrate to a newer version (all things being equal and assuming it won't
break the new system)

I'm sure the answer is probably simple, but for the life of me I can't
figure it out !

Any help or assistance would be gratefully appreciated !!!

B. Rgds
John

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2948470

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2012-04-16 00:30:56 CEST