Zurück zu Willert.de

Configuration Management

Talk and discuss about whatever you want ... it's an open space

Re: Configuration Management

Postby Farquad » December 23rd, 2009, 5:55 pm

What do you mean by "it is unable to diff state diagrams"?

The merge works best when you provide a base. It is a very powerful tool when used this way and has been proven to work in challenging environments such as mobile comms projects. If you are struggling then it's best to ask for some advice.
Farquad
 
Posts: 407
Joined: September 13th, 2007, 9:34 pm
Location: London

Re: Configuration Management

Postby chasl » January 5th, 2010, 3:40 pm

Farquad wrote:The merge works best when you provide a base. It is a very powerful tool when used this way and has been proven to work in challenging environments such as mobile comms projects. If you are struggling then it's best to ask for some advice.


Confirming this, I would note that we have recently had to apply changes to both a branch and a mainline version of an sbs file containing classes including attributes, operations, state charts, etc. My experience is that, having applied the changes once (typically in the branch), doing the same to the mainline is quite quick using base-aware merging. OMD layouts usually need some manual adjustment, but copy-paste from one side to the merge is fairly effective. Textual changes, e.g. to operation bodies, types, properties, etc, are very easy. The only time it became more difficult was due to my own stupidity when I had renamed some states in the branch but not in the mainline: more manual adjustment was needed in that case, but it was still worth using DiffMerge.
chasl
 
Posts: 27
Joined: February 3rd, 2009, 5:58 pm
Location: Bonnie Scotland

Re: Configuration Management

Postby lbhopkins » September 11th, 2013, 6:33 pm

Hi, I was wondering if it would it be useful to have a configuration management tool that allows you to visualise configuration changes and compare revisions side by side ?
lbhopkins
 
Posts: 1
Joined: September 11th, 2013, 6:19 pm

Re: Configuration Management

Postby ftheile » June 19th, 2020, 2:57 pm

How to set DiffMerge as default Git diff tool for Rhapsody files

All steps to show my configuration are done in Git Bash.

1. To make things easy, make sure you have the path to diffmerge.exe in your $PATH:
Code: Select all
$ echo $PATH | grep -i rhapsody
...:/c/Program Files/IBM/Rational/Rhapsody/8.4:...


2. Specify an external diff driver with the (arbitrary) name `rpy-diff` to run DiffMerge when invoked.
Do this either for the current repository only (`--local`) or globaly for the current user (use `--global` instead of `--local`):
Code: Select all
$ git config --local diff.rpy-diff.command diffmerge.exe

See gitattributes(5) for details.

3. Add all files to be diffed with diff driver `rpy-diff` to your repository's `.gitattributes` file:
Code: Select all
$ cat .gitattributes | grep rpy-diff
*.cmpx diff=rpy-diff
*.omdx diff=rpy-diff
*.rpwx diff=rpy-diff
*.rpyx diff=rpy-diff
*.sbsx diff=rpy-diff


4. Check for changes in your working tree:
Code: Select all
$ git status
On branch porting
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   SmartDigitalFlex_rpy/Types_Pkg.sbsx

no changes added to commit (use "git add" and/or "git commit -a")


5. To see the diff for that file in DiffMerge:
Code: Select all
$ git diff SmartDigitalFlex_rpy/Types_Pkg.sbsx
ftheile
 
Posts: 2
Joined: March 5th, 2014, 10:04 am
Company: Grundfos Water Treatment GmbH
Position: Embedded software de

Previous

Return to Open Space

Who is online

Users browsing this forum: No registered users and 1 guest