[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [qvtd-dev] Branch merging
|
Hi,
I have pushed to hhoyos/master.
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 Ed Willink
Sent: 19 February 2015 15:00
To: qvtd-dev@xxxxxxxxxxx
Subject: Re: [qvtd-dev] Branch merging
Hi
Horacio: please push your fix on some recent branch; the commit date will be
obvious.
Adolfo: I can see your changes.
If you can avoid pushing anything else till tomorrow, we can hopefully start
tomorrow with an unambiguous master.
Regards
Ed
On 19/02/2015 14:23, Horacio Hoyos Rodriguez wrote:
> Hi,
>
> I have reviewed ewillink/master and just made some small changes the
> QVTi imperative tests to clear the confusion between ClassToRDBMS and
> UMLtoRDBMS. I think it is now usable as a common commit. I think
> Adolfo's upcoming commit on line endings will merge easily with this
> changes.
>
> 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: 19 February 2015 14:20
> To: qvtd-dev@xxxxxxxxxxx
> Subject: Re: [qvtd-dev] Branch merging
>
> Hi Ed,
>
> I recommend not spending more time on that. For the time being, nobody
> cares about those build.cs2as test cases/plugins, let them be as they are.
>
> I've got another commit which I want to push it asap, which is
> currently on ewillink/master. It's related to line endings and I'll
> mail on a separate thread.
>
> Regards,
> Adolfo.
> On 19/02/2015 12:43, Ed Willink wrote:
>> Hi
>>
>> Ok. I'll merge 'from' asanchez/mtc rather than asanchez/nameResoCG then.
>>
>> ewillink/master is only a candidate, but hopefully you can easily
>> rebase on the eventual true merge to master.
>>
>> Regards
>>
>> Ed
>>
>> On 19/02/2015 12:31, Adolfo Sanchez-Barbudo Herrera wrote:
>>> Hi,
>>>
>>> I wouldn't have included asanchez/nameResoCG commits. Those were
>>> recent changes about ongoing work related to CG for name resolution.
>>> However, OCL2QVTi test cases are not completely stabilized in
>>> asanchez/mtc so there should not be too much trouble if
>>> asanchez/nameResoCG is also included.
>>>
>>> I'm not going to revolve too much on this. The test cases results
>>> are the expected one, so from my side I'm happy with ewillink/master.
>>> I'll move my branches to there.
>>>
>>> I presume Horacio will have something to add.
>>>
>>> Regards,
>>> Adolfo.
>>> --
>>> On 19/02/2015 11:48, Ed Willink wrote:
>>>> Hi
>>>>
>>>> Branch ewillink/master is a candidate for the merge to master.
>>>>
>>>> It has one additional commit on master to catch up on the many
>>>> changes that have occurred in build.schedule.
>>>>
>>>> It has four commits on the merge side to eradicate conflicts with
>>>> master.
>>>>
>>>> As a result the merge itself has only one conflict on QVTdMtcTests
>>>> that is easily fixed, but perhaps too many tests are disabled.
>>>>
>>>> Please review ewillink/master to see if it is useable as a common
>>>> commit for future progress.
>>>>
>>>> I don't plan to touch ewillink/master for a couple of days so that
>>>> your review can take place.
>>>>
>>>> If you don't like it, push an asanchez/master or hhoyos/master
>>>> branch with your better solution.
>>>>
>>>> Regards
>>>>
>>>> Ed Willink
>>>>
>>>> On 18/02/2015 19:20, Adolfo Sanchez-Barbudo Herrera wrote:
>>>>> 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
>>>>>
>>>>>
>>>>> -----
>>>>> No virus found in this message.
>>>>> Checked by AVG - www.avg.com
>>>>> Version: 2015.0.5646 / Virus Database: 4284/9135 - Release Date:
>>>>> 02/18/15
>>>>>
>>>>>
>>>>>
>>>> _______________________________________________
>>>> 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
>>>
>>>
>>>
>> _______________________________________________
>> 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
_______________________________________________
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
