commit	93d9c7e12fce4018d4c0d4540002636211d42aee	[log] [tgz]
author	Arthur Daussy <arthur.daussy@obeo.fr>	Mon Dec 01 16:58:41 2014 +0100
committer	Arthur Daussy <arthur.daussy@obeo.fr>	Tue Dec 02 15:49:52 2014 +0100
tree	1f20c011adb82f4842455f80c6ac6f3f7124e0ba
parent	1b25a5bb61cdbd6461327ab85d50cadf6401bfa8 [diff]

Adds new tests for cherry-pick and rebase applications

It also refactors the name of the tests for the rebase application.

Change-Id: I10e191266cc44740482f6a7094929295f80f71d3

plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/AbstractApplicationTest.java[diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/CherryPickApplicationTest.java[diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/RebaseApplicationTest.java[diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/ContextSetup.java[diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/REB016/branch_a/model.di[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/REB016/branch_a/model.notation[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/REB016/branch_a/model.uml[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/REB016/branch_b/model.di[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/REB016/branch_b/model.notation[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/REB016/branch_b/model.uml[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_a/P1.di[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_a/P1.notation[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_a/P1.uml[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_a/P2.di[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_a/P2.notation[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_a/P2.uml[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_a/model.di[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_a/model.notation[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_a/model.uml[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_b/P1.di[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_b/P1.notation[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_b/P1.uml[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_b/P2.di[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_b/P2.notation[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_b/P2.uml[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_b/model.di[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_b/model.notation[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_b/model.uml[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_c/P1.di[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_c/P1.notation[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_c/P1.uml[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_c/P2.di[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_c/P2.notation[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_c/P2.uml[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_c/model.di[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_c/model.notation[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/REB014/branch_c/model.uml[Added - diff]

37 files changed

tree: 1f20c011adb82f4842455f80c6ac6f3f7124e0ba

examples/
org.eclipse.emf.compare.git.pgm-parent/
packaging/
plugins/
.gitignore
LICENSE
README.md

README.md

EMFCompareGitPGM

This is a temporary repository holding the work on the EMF Compare command line application. This application aims to handle EMF model on git repository from a command line tool. This repository will soon migrate to the eclipse foundation.