Eclipse Community Forums: EMF » Multiple branch merging in CDO

Help

Home

Home » Modeling » EMF » Multiple branch merging in CDO

Show: Today's Messages :: Show Polls :: Message Navigator

Multiple branch merging in CDO [message #659017]

Thu, 10 March 2011 17:12

Cameron Bateman

Messages: 3
Registered: February 2011

Junior Member

Greetings,

I'm working with a large EMF model in CDO.

What I am trying to do is have a sequence of branches that is similar to the release branches in a regular ALM system. For example, I might want to have "DEV", "Q/A" and "PRODUCTION" branches. As changes to my model progress through a
release workflow, I want to promote changes from DEV -> Q/A -> PRODUCTION. Even assuming I make DEV = MAIN, I will need a minimum of two downstream branches in addition to MAIN. Note that I want to merge over and over again from DEV->Q/A->PRODUCTION as changes are made in DEV in need to be promoted.

When I try to do this with example code I've found for merging, it works on the first try but then never finds any further deltas to commit to the target branch on subsequent tries as described here:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=339271

Has anyone else tried anything like this? Has this type of use case been considered with CDO branch/merge before?

Thanks,

Cameron

Report message to a moderator

Re: Multiple branch merging in CDO [message #659321 is a reply to message #659017]

Sat, 12 March 2011 07:30

Eike Stepper

Messages: 6682
Registered: July 2009

Senior Member

Am 10.03.2011 18:12, schrieb Cameron Bateman:
> Greetings,
>
> I'm working with a large EMF model in CDO.
>
> What I am trying to do is have a sequence of branches that is similar to the release branches in a regular ALM system. For example, I might want to have "DEV", "Q/A" and "PRODUCTION" branches. As changes to my model progress through a release workflow, I want to promote changes from DEV -> Q/A -> PRODUCTION. Even assuming I make DEV = MAIN, I will need a minimum of two downstream branches in addition to MAIN. Note that I want to merge over and over again from DEV->Q/A->PRODUCTION as changes are made in DEV in need to be promoted.
>
> When I try to do this with example code I've found for merging, it works on the first try but then never finds any further deltas to commit to the target branch on subsequent tries as described here:
>
> https://bugs.eclipse.org/bugs/show_bug.cgi?id=339271
Hi Cameron, I've left a suggestion on that bug...

Cheers
/Eike

----
http://www.esc-net.de
http://thegordian.blogspot.com
http://twitter.com/eikestepper

>
> Has anyone else tried anything like this? Has this type of use case been considered with CDO branch/merge before?
>
>
> Thanks,
>
> Cameron

Cheers
/Eike

----
http://www.esc-net.de
http://thegordian.blogspot.com
http://twitter.com/eikestepper

Report message to a moderator

Previous Topic:	Best practices: versioning .ecore files
Next Topic:	Save key value pairs

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Fri Apr 26 00:54:27 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter