Subversion and Lock

[danone]

Hi together,

I have tried your enterprise architect (corporate edition) in conjunction with subversion as a version control system. Now I have noticed that if a user checks out a package it gets locked in subversion. Another user is not able to edit the
package till the first user checks that package in.

Is there a way to change this behavior (isn't enterprise architect able to merge changes?). I don't want to get a lock on a package when someone performs a check out. I think the packages are stored in "plain text" (XML) files, so a merge (and diff) should be possible.

Did I miss something?

Cheers,
danone

[morsor]

The situation is as you describe; there is no merging because conflicts are prevented from ever arising.

http://www.sparxsystems.com.au/EAUserGuide/index.html?version_control_with_cvs.htm

The above is CVS-specific, but I would imagine the support for Subversion is similar.

[peter.zrnko]

EA doesn't merge version controled packages.

But you can version control subpackages. See "Using Nested Version Control Packages" in help.

(There is an option to merge EA projects saved in eap files. see "Replication" in help.)