|Re: Merging and VCS Best Practices [message #1063650 is a reply to message #1063477]
||Thu, 13 June 2013 15:19
| Ed Merks
Registered: July 2009
On 13/06/2013 11:30 AM, Dirk Hoffmann wrote:
> most of you know that painful task of backporting features to an older
> version of your software. When we do so we merge changes from the
> trunk to the branch representing that older version using a VCS.
> With one of my first projects, that used EMF, generated files without
> modifications were not versioned, meaning that the one who checks out
> and builds the software needs to generate the source code.
I'm not a big fan of that approach. It's always good to know that your
code base is stable and if you get a new version of the generator tools,
it's good to know how it's generating code differently.
> These days I also version the generated code so no code generation is
> required when building the code and there is less danger to forget to
> add a file to version control once I change "generated" to "generated
Yes, that's the approach I generally use; I think most do.
> The .ecore, .ecorediag and .genmodel files are of course versioned as
> When it comes to merging I do not care about the latter ones. In the
> branches I only apply the merging operations to the generated code and
> there I never generate code from the model. This sometimes means that
> I have to touch generated code that I normally wouldn't, e.g. to fix
> numerical constants in the EPackageImpl's representing my models.
Fix? They shouldn't be broken!
> Is there any best practice regarding the merging anc VCS business?
> How do others cope with merging models or generated code?
> Thanks and Regards,
|Re: Merging and VCS Best Practices [message #1063853 is a reply to message #1063801]
||Fri, 14 June 2013 13:57
| Mikael Barbero
Registered: July 2009
the 1.2 version wasn't able to copy changes from one file to another so
I replaced it with the 2.1 RC4. But this version does not work at all.
The editor window just remains grey.
I am working with Eclipse 3.6. I just tried to copare two .ecore files
with Compare With->Each Other from the context menu.
This is very strange because it is a very basic usage we tested a lot. Did you do the update from 1.2 to 2.1? I know that we have some issues with update and we are advising to first uninstall 1.x before installing 2.1. Could you have a look on this?
How is it related to the EMF Diff/Merge project?
EMF Diff/Merge is a essentially a runtime technology to compare and merge EMF models. As such, it shares some common goals with EMF Compare. But, whereas EMF Compare provides full support for the Eclipse Team API (even the logical model one: see http://wiki.eclipse.org/EMF_Compare/Logical_Resources for more details) and then work with the VCS supported by Eclipse, EMF Diff/Merge does not integrate with Eclipse Team and then do not integrate with any VCS.
Powered by FUDForum
. Page generated in 0.08422 seconds