Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [qvtd-dev] Branch merging

Hi

Similarly I don't think I read this.

Time has passed, ManualUML2RDBMS and SimpleUML2RDBMS have resolved the name conflict, with for now different internal test stresses. Once some test is more demanding a combine UML2RDBMS could emerge.

"2" generally is good for me.

CamelCase acronym spelling.

Spelling acronyms in uppercase doesn't acrually work. If you start combining acronyms such as UML and FFT, the only tenable policy is that an acronym is actually a new word and so the composite is UmlFft. Unfortunately no body does this, notably OMG, EMF, Eclipse UML2 all follow your all capitals instinct, so being more sensible is confusing. So yes all capitals for acronyms.

I'm reluctant to change ModelMorf examples right now. It achieves very little when we have many more important things to do. The examples are already in pre-releases. One day we might move them to o.e.qvtd.test.samples.modelmorf.

    Regards

        Ed


On 19/02/2015 11:37, Horacio Hoyos Rodriguez wrote:
Hi,

I think we should also define a single UML to RDBMS naming, and what
should be  a naming policy for our test examples in the future.  I think
we should be consistent in naming all our transformations

<Input>2<Output>

Using the number 2 as a phonetic replacement of "to" has the benefit that
it is distinguishable from any naming conventions in the input and output
names. For names I will suggest using all upper cases only when the
input/output name stands for an acronym, and in the rest of the cases
capitalized names. With this, the UML to RDBMS example in all our tests
should be renamed to  UML2RDBMS. All of the other examples follow the
proposed convention.

For all transformations in the ModelMorf examples plugin I would suggest
doing the name change, I think it will also make it clear that they are
not the exact same transformations as why might need to update them to
comply to the latest concrete syntax changes and fix any possible
typos/errors.

Regards,



Horacio Hoyos Rodríguez
EngD Student
University of York

http://www.york.ac.uk/docs/disclaimer/email.htm

-----Original Message-----
From: qvtd-dev-bounces@xxxxxxxxxxx [mailto:qvtd-dev-bounces@xxxxxxxxxxx]
On Behalf Of Adolfo Sanchez-Barbudo Herrera
Sent: 18 February 2015 19:21
To: qvtd-dev@xxxxxxxxxxx
Subject: Re: [qvtd-dev] Branch merging

Hi ,

Done.

QVTd test cases don't pass. They were messed up again in hhoyos/mtc[1] ;P.
Actually, I still see both
org.eclipse.qvtd.xtext.qvtimperative.tests.ClassToRDBMS and
org.eclipse.qvtd.xtext.qvtimperative.tests.UMLToRDBMS confusing packages.
I presume just one of them should remain.

I prefer to leave that final fix to Horacio because he knows what exactly
should remain there.

Feel free to fix it on top of your branch (hhoyos/mtc). I'll rebase again
tomorrow.

[1] commit a26be828f55cb07aa0787e6d3778d4fcc220b4fa

Regards,
Adolfo.
On 18/02/2015 18:15, Adolfo Sanchez-Barbudo Herrera wrote:
Hi,

I'll rebase my recent stuff on top horacio's one (hhoyos/mtc). This
will include additional commit with Unix line-ending review and such.

Regards,
Adolfo.

On 18/02/2015 18:10, Horacio Hoyos Rodriguez wrote:
Hi,

I have merged both asanchez and hhoyos latest development into
hhoyos/mtc, which also has merged from master and have fixed line
endings on all files in that merge. You should be able to merge it
into master.

Regards,

On 18 February 2015 at 16:55, Ed Willink <ed@xxxxxxxxxxxxx
<mailto:ed@xxxxxxxxxxxxx>> wrote:

     Hi

     I've been trying to tidy up the current branch anarchy so that we
     have a sensible master that incorporates all the good work, but:

     It seems we already have
     - many bad rebases - inconsistent usage of OCL plugins
     - some bad merges - syntax errors from merge annotations
     - some bad files - inconsistent Unix/Windows characteristics

     Tidying up is not a trivial job and while it may make the history
     look tidier it may actually just add a further layer of obfuscation
     for anyone who really wants to understand the anarchic history.

     So I give up.

     Please merge all active asanchez and hhoyos branches to provide a
     single branch that I can merge with master.

     In the future please ensure that wherever possible ongoing work is
     rebased on, or merged from, the most recent unifying master merge
of
     new work. Please avoid continuing work from stale commits.

     Please ensure that all projects have explicit Unix, UTF-8
     characteristics. Please ensure that all non-binary files are
     converted to Unix/UTF-8 before committing. Unfortunately some model
     tools do not get this right. If Windows files are accidentally
     committed, please rework the offending commits.

     If a bad merge is detected, please rework to correct the bad merge
     at the merge; not four commits later.

          Regards

              Ed Willink
     _________________________________________________
     qvtd-dev mailing list
     qvtd-dev@xxxxxxxxxxx <mailto:qvtd-dev@xxxxxxxxxxx>
     To change your delivery options, retrieve your password, or
     unsubscribe from this list, visit
     https://dev.eclipse.org/__mailman/listinfo/qvtd-dev
     <https://dev.eclipse.org/mailman/listinfo/qvtd-dev>




--

Horacio Hoyos Rodríguez
EngD Student
University of York


Email Disclaimer:
http://www.york.ac.uk/docs/__disclaimer/email.htm
<http://www.york.ac.uk/docs/disclaimer/email.htm>


_______________________________________________
qvtd-dev mailing list
qvtd-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or
unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/qvtd-dev

_______________________________________________
qvtd-dev mailing list
qvtd-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe
from this list, visit https://dev.eclipse.org/mailman/listinfo/qvtd-dev
_______________________________________________
qvtd-dev mailing list
qvtd-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/qvtd-dev

-----
No virus found in this message.
Checked by AVG - www.avg.com
Version: 2015.0.5646 / Virus Database: 4284/9143 - Release Date: 02/19/15



Back to the top