Reviewing merge request #4: Change parsing of "event" attribute of transitions.

This commit changes the parsing of the "event" attribute of "transition" elements to prevent a rather subtle bug when using transitions that are triggered by multiple events.

See the commit comment for details.

Regards
Marc Schmitzer

Requested by: marcschmitzer
Status: Merged
Source repository: scxml-fixes:master
Target repository: scxml:master
Created at: January 27th, 2012 15:39

Commits that would be merged:

Version 1

Version 1

eb07b34
9be5070

Change parsing of "event" attribute of transitions.

Showing

Showing eb07b34-9be5070

Comments
Include comments entered inline

Pushed new version 1

marcschmitzer | 2012-01-27 15:39:56 UTC

→ State changed from New to Merged

Noam Rosenthal | 2012-02-02 00:32:40 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/4

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/qt-labs/scxml.git \
  refs/merge-requests/4

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/4

# To apply the changes to your branch:
git checkout master
git merge merge-requests/4
git push origin master

Reviewing merge request #4: Change parsing of "event" attribute of transitions.

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline