Show Posts

This section allows you to view all posts made by this member. Note that you can only see posts made in areas you currently have access to.


Messages - PatrickSullivan

Pages: [1]
1
Ah I get it Geert.  Thanks.

It doesn't seem trivial to add into our Version control through links within EAP, so I am adding the files into our Version Control system manually.

I was able to merge the changes, but I'm sure I did it the hard way...!!!!  I went into the compare utility and did a "Compare Model to File".  I got all the changes in a tree (and did a right click on the item I wanted to merge), but had to actually select each tree, branch and leaf item (i.e. I couldn't select the high level directory and merge recursively - no recursive selection that I could see...) to highlight and merge!  It took too long to select ever single step, associate, link, object etc... to merge up...  Is there a way to recursively or universally accept all changes without having to go into each item and all sub-items??

This whole merging isn't optimal, but since we are only a team of 2, and we will not need to both be working on the same drawing at each time (we can communicate name changes etc...) it would work as long as we could merge without having to select each detailed item (need recursive or universal selection for merging)...??

2
Thanks guys for the posts but I must be missing something here.  Isn't it normal for two engineers to be working separately (i.e. one on one module and the other engineer on another assigned module?).

I don't think extreme programming (i.e. working together at the same desk on the same module together) is efficient for our case.

Is there a way to manually merge (i.e. cut and past drawing from one EA file to another?)?  I tried this, but it only copies the graphics and not the objects...  :(  I have separate pages (i.e. one State Diagram, one Object Diagram, and one Sequence Diagram).  I want to simply add them to my co-workers EAP file at this point, but cannot cut and past (when opening two sessions of EAP)...  This is unexpected... as it would be a nice way to manually merge...

The product brochure said "easy for concurrent engineering", but it doesn't seem to be the case...

3
Thanks qwerty.  So the most recommended (first item) means that we cannot work in parallel?  Or can I merge somehow after my teammate puts their changes in?

I cannot even find a way to cut and past diagram info (i.e. Select All then copy and paste from one file to another...).  So I cannot even figure out how to manually put my changes onto the master (if merge doesn't work...).

I don't understand the third item ("isolate changes in single package and ex-/import between modellers").  I thought a "package" was only a single drawing (probably not in this context though...)?  I tried importing and exporting XML/XMI files a little bit but it complains (since probably from different roots) - as I tried to import the different file (renaming it to be the same as mine) within the baseline dialog...

This tool is very complicated when it comes to merging it seems...  If XML/ XMI, it should have some utility... (I did see diffing with your own drawing causes false diff records which are actually the same...)...  AUGGGHHH!!!  >:(

4
Hi Forum,

Simply, we have 2 users (me and a coworker).  We are changing our BMS.EAP files independently, and we need to merge our changes together now.  I can't even get to the point of getting a change diff (since files and/or filenames separate).   :(
 
More Info:
- We have a root base file
- We each have two separate files.  Neither of us created baselines.  The filenames might be different than the root base filename or each other.
 
What do we do to merge our work?  I tried many things but couldn't.  Help is not that helpful...  Any advice is much appreciated!!!
 
Thanks,
 
Patrick Sullivan
SW Engineer
Valence Technology//

Pages: [1]