Version control in EA

[jwa]

Hi All,

I have two related questions.

1.
Suppose I have a version controlled package (lets call it "Entity Model") which is stored in subversion:

/entityModel/branches/m1/entityModel.xml

At some point I have created the m2 branch out of m1 so I have

/entityModel/branches/m1/entityModel.xml
/entityModel/branches/m2/entityModel.xml

Changes have been made to the two branches and I would like to merge changes from m1 to m2. Is there any tool support in EA to do this?

2.
Suppose I have checked out branch m1 to directory m1 and m2 to directory m2. As m2 was branched of off m1 it will have the same version control unique id. For each branch I have created a model. I would like to work with the two models (branches) without any manual intervention (except of some initial setup, like configuring the version control settings).

What is causing me problems is that the working copy path is stored in the local paths settings under the (version control) unique id. So whenever I'm changing from m1 to m2 I have to manually reset the working copy path (which is kind of error prone). Do you know of any possibility how to get around this problem?

with regards,
juraj

[Martin Terreni]

The second question I can't answer, but for the first one a solution could be using some XML merger (I used natve of ClearCase). It is far less confortable then grphicly doing it, but it does the work.

[thomaskilian]

With regards to 2 you should consider relative paths (you have to manually set them like ../sisterdir/etc). Also you might look into Local Paths (enter Path in the Help and refer to the first match).