In the meantime I commited the change on genmodel (suppress EMF
types) and it worked well.
Von:
mdt-bpmn2.dev-bounces@xxxxxxxxxxx [mailto:mdt-bpmn2.dev-bounces@xxxxxxxxxxx] Im
Auftrag von Antoine Toulme
Gesendet: Freitag, 16. Juli 2010 06:12
An: BPMN2 Developers Mailing List
Betreff: Re: [mdt-bpmn2.dev] Points to clearify
Reiner, I did not recreate my change. I'll do it certainly
tomorrow unless you get to do it first. My only change was to remove the EMF
types in the genmodel.
Also if you could make sure
everything is fine for you at checkin with the new gitattributes file, that'd
be great.
On Thu, Jul 15, 2010 at 09:24, Henning Heitkötter <hheitkoetter@xxxxxxxxxxxxxx>
wrote:
Note that you should also be
able to force your master branch to adopt the non-linear history with 'git
branch -f master origin/master'. (After fetching from origin with
force-update.)
That way you don't have to clone again and don't lose any other branches.
Regards,
Henning
2010/7/15 Hille-Doering, Reiner <reiner.hille-doering@xxxxxxx>
Thanks Antoine. I will revert
my local changes (I can easily redo) and also my local repository and then
re-clone. Let’s see how it looks.
I
removed my offending commit and will recommit without removing the @generated
NOT tags.
I will
probably still (unwillingly) convert the files to LF endings. I added a file
named .gitattributes at the root of the checkout, and going forward all CRLF
files will be converted to LF on checkin.
I
can try to convert globally to LF endings. I'll give it a shot.
On
Thu, Jul 15, 2010 at 07:09, Antoine Toulme <antoine@xxxxxxxxxxxxxxx>
wrote:
My
apologies for the trouble I caused.
On
Thu, Jul 15, 2010 at 05:37, Hille-Doering, Reiner <reiner.hille-doering@xxxxxxx>
wrote:
I see that you all work and commit improvement –
great.
However I see some issues that we should clearify:
- I see that after
Antoin’s last commit all committed files have UNIX line ending (0x0A).
Before they had Windows ending (0x0D0A). This is a problem, because
diffing is complicated. I don’t have problems with Unix line endings, but
we should do it consistently.
I
see. We should have some configuration at the repository level for that.
- Antoin’s commit
killed some of my “@generated NOT” methods. At least in
“Bpmn2ResourceFactoryImpl” my handwritten code is lost. This is really
bad, because without the changes the BPMN XML import and save will not
work. I would ask you to avoid deleting files before regeneration or
before commit to check the diffs carefully.
-
- I would like to
know if we want to rename the plugins, packages and class name prefixes
back from “bpmn2” to “bpmn”. I can do it, but it would be good to have no
parallel central commits, because merging such change is almost
impossible. Please vote.
- The same questions
applies for the package prefix for the “di” and “dc” packages to include
“dd”.
If
it's not too late, we can drop my last commit, redo the change in the genmodel
and regenerate the code.
_______________________________________________
mdt-bpmn2.dev mailing list
mdt-bpmn2.dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/mdt-bpmn2.dev
_______________________________________________
mdt-bpmn2.dev mailing list
mdt-bpmn2.dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/mdt-bpmn2.dev
|
