repo.or.cz
/
EMFCompare2.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[530250] Fix RecursiveModelMerger to be able to handle Git attributes
2018-01-24
Arthur Daussy
[530250]
F
ix Recur
s
iveMode
l
M
e
r
g
e
r to
b
e
abl
e
to
h
andle
.
.
.
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
Removing
the Papyru
s
p
l
u
gin
s
and
f
eat
u
res from the
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
An
t
onio Campesino
[525557] Rigth
T
aversal override with Base traversal
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Lauren
t
G
o
ubet
A
P
I break in JGi
t
4
.
9
d
u
e to the f
i
x fo
r
bug 5
1
7128
commit
|
commitdiff
|
tree
2017-09-08
Ale
x
and
r
a B
u
zila
[51
3
9
3
1
]
F
i
x Dead
l
o
c
k
in StructureMergeViewer
commit
|
commitdiff
|
tree
2017-09-08
Laurent Goubet
[
51
0
420
]
Adding missing exten
s
i
o
n point definitio
n
s
.
.
.
commit
|
commitdiff
|
tree
2017-09-08
Martin Fleck
[518957] Reus
e
Semantic
U
M
LConten
t
Provider in
s
tance
.
.
.
commit
|
commitdiff
|
tree
2017-09-08
Philip Langer
Avoid NPE in Ma
t
c
h
Util and IOOB in ReferenceChang
e
Merger
commit
|
commitdiff
|
tree
2017-09-08
Philip L
a
nger
[515581] M
a
ke test plug-ins available from the updat
e
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
M
artin
Fleck
[
516060]
Opaque Action Body conflict reso
l
uti
o
n results
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Laurent Goube
t
[515591] Try and
f
ix random test
f
ailures
commit
|
commitdiff
|
tree
2017-09-07
Mart
i
n Fleck
[
5
18572] Naviga
t
able sh
o
ul
d
use co
n
tent
p
rov
i
der to
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
M
a
thieu Cartaud
[518760]
R
emove legacy
JUnit3 artefac
t
s
commit
|
commitdiff
|
tree
2017-09-07
Mart
i
n Fle
c
k
[
518
9
68] Only
t
ra
v
erse an
d
cache nece
s
s
a
ry Papyrus
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Mart
i
n Fleck
[518983] Co
m
pareInpu
t
A
dapter
should cache ancestor
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Martin Fle
c
k
[5
1
8986]
T
itl
e
of
c
ompare e
d
itor sho
u
ld be computed
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[519003]
E
n
sure undo/redo i
s
activat
e
wh
e
n SMV ha
s
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
L
a
ur
e
nt Goubet
performance plugin i
s
sues
commit
|
commitdiff
|
tree
2017-09-05
M
athieu Cartaud
[462863] Staging Prompt
a
f
ter Resolv
i
ng C
o
nflicts
commit
|
commitdiff
|
tree
2017-09-05
Martin Fleck
[
5
18981] Alwa
y
s use
s
pec
i
alized logic whe
n
using
Revisioned
U
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Martin Fleck
[519025] Only co
n
sider
references when fi
n
ding stereo
t
ype
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Lau
r
ent Goubet
[
5
2
1358] documentation
f
or
E
MFCompa
r
eRCPPlugin missing
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
C
h
r
i
stian W
.
Damus
[
5
20105] [Tests]
Mave
n
e
xecut
i
on of Git
t
ests fails
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Laure
n
t
Goubet
Bu
m
p
i
n
g versio
n
s
f
o
r Oxygen
.
1
commit
|
commitdiff
|
tree
2017-08-23
Laurent
Goubet
Removing no
n
functi
o
nal p
r
ofil
e
s
f
rom p
o
m
commit
|
commitdiff
|
tree
2017-08-22
Laurent
G
oub
e
t
S
e
p
arate core & extra build
s
commit
|
commitdiff
|
tree
2017-07-21
M
a
rtin
Fleck
Relax
C
om
p
are
C
onsiderations of IMer
g
eViewerItems
commit
|
commitdiff
|
tree
2017-07-20
Phili
p
Lang
e
r
Add a few mi
s
sin
g
license headers
commit
|
commitdiff
|
tree
2017-07-07
Ph
i
lip Langer
Refa
c
t
orings to i
m
prov
e
p
erformanc
e
of MatchUtil
commit
|
commitdiff
|
tree
2017-07-07
L
a
urent
Goubet
[518
6
12
]
F
requent CME from the adapte
r
factory
dispo
s
al
commit
|
commitdiff
|
tree
2017-07-07
M
a
rtin
F
lec
k
[518979] Re
m
ove context entri
e
s
with an empty
c
ache
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Ma
r
tin F
l
eck
[519016]
Avoi
d
repeated r
e
s
ource traversal wh
e
n
r
esolving
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin Fleck
[5190
3
3] D
o
not refresh the SM
V
viewer af
t
er every
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Marti
n
Fleck
[519023] C
h
eck cancellati
o
n les
s
fr
e
quent
l
y
in conflict
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Philip L
a
nger
[516524] Use more e
f
ficient
f
eature
l
o
o
k-up in ReferenceUtil
commit
|
commitdiff
|
tree
2017-07-06
Chris
t
ian W
.
Damu
s
[5
1
92
6
1] [Oomph] Setup
model pro
b
lems
for Oxygen
commit
|
commitdiff
|
tree
2017-07-06
Christian W
.
Da
m
us
[519170] [
C
h
e
ckstyle] Author format const
r
aint is too
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Ch
r
istian W
.
Damus
[519227] [
C
hec
k
style] Sty
l
e
e
rr
o
rs in oee
.
compare
bundle
commit
|
commitdiff
|
tree
2017-07-06
L
a
urent Goubet
U
se
t
h
e
released versio
n
of EGi
t
commit
|
commitdiff
|
tree
2017-06-29
Ant
o
nio Camp
e
s
i
no
Bug 518608 -
D
u
p
licated / Mixed Stage
n
o
t
a
llo
w
e
d exception
.
.
.
commit
|
commitdiff
|
tree
2017-06-27
Martin F
l
ec
k
[48
7
15
1
] Accept all non-conflicting
c
hang
e
s f
a
ils t
o
.
.
.
commit
|
commitdiff
|
tree
2017-06-27
Martin Fl
e
ck
[
51441
5
] Rela
t
ionships
b
e
twe
e
n diffs should be cache
d
commit
|
commitdiff
|
tree
2017-06-26
Martin
Fleck
[
514767]
Provide prefere
n
ces to con
f
i
gu
r
e com
p
arison
.
.
.
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[5
0
7157]
C
h
eck
u
s
a
ge of InputStreams
w
i
t
h mo
c
kit
o
commit
|
commitdiff
|
tree
2017-06-26
Martin Flec
k
[512677] Reg
i
ster EM
F
ModelProvider for new Papyrus
.
.
.
commit
|
commitdiff
|
tree
2017-06-26
Martin F
l
eck
[514382] Pre
-
Merge on confl
i
c
t
can lead to da
t
a
loss
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[51407
9
] Implem
e
nt Mirroring: Swap left/right side
.
.
.
commit
|
commitdiff
|
tree
2017-06-12
Laurent Gou
b
et
"spy"ing is the
r
oot ca
u
se of a huge memo
r
y leak
commit
|
commitdiff
|
tree
2017-06-06
Laurent Goubet
R
evert "Refactorings to improve performance
o
f
M
atc
h
U
t
il"
commit
|
commitdiff
|
tree
2017-06-06
L
aur
e
nt Goube
t
R
evert "Use
more efficient fea
t
ure
l
ook-up in Re
f
erenceUtil"
commit
|
commitdiff
|
tree
2017-06-06
Philip Langer
Update
O
x
y
gen tar
g
et to new SysML 1
.
1 update site
commit
|
commitdiff
|
tree
2017-05-12
Philip Langer
[51650
8
] Cache unresolvab
l
e proxies i
n
No
t
LoadingR
e
sourceSet
commit
|
commitdiff
|
tree
2017-05-12
Phil
i
p Langer
[516520] Avoid unnecess
a
ry no
t
i
f
i
cations of comparison
.
.
.
commit
|
commitdiff
|
tree
2017-05-11
Lau
r
ent Goubet
[5163
4
5
] Inconsi
s
tency with the logical model reso
l
ution
commit
|
commitdiff
|
tree
2017-05-11
Laurent Gou
b
et
Compatibility with gua
v
a 2
1
commit
|
commitdiff
|
tree
2017-05-09
Ma
r
tin Flec
k
[51
4
079] De
f
ault to T
e
xtM
e
rgeView
e
r resou
r
ces
f
or
i
cons
.
.
.
commit
|
commitdiff
|
tree
2017-05-09
Ph
i
lip Langer
[509975] Sele
c
t
i
on should be
c
o
n
sidered
f
or "next"
.
.
.
commit
|
commitdiff
|
tree
2017-05-09
Laure
n
t Goubet
[
5
1
5039] avoid throwi
n
g exceptions durin
g
resource
.
.
.
commit
|
commitdiff
|
tree
2017-04-11
Al
e
xandra Buzila
[51
4
545]
e
git
.
u
i plugin does not export its
pa
c
kages
commit
|
commitdiff
|
tree
2017-04-10
Martin Fleck
[512562
]
D
iff/mer
g
e ca
n
't h
a
ndle m
u
ltiple repos
commit
|
commitdiff
|
tree
2017-04-10
P
h
ili
p
Langer
[5088
5
5
]
Supp
o
r
t
sta
r
ting comparisons
from containe
r
s
commit
|
commitdiff
|
tree
2017-04-07
Laurent Goubet
Bump
v
e
r
s
i
o
n
s for
E
MF Compare 3
.
3
.
1
commit
|
commitdiff
|
tree
2017-04-07
Ste
f
an Dirix
[50
7
05
0
] Fix conf
l
i
ct mergi
n
g
when pre-m
e
r
g
e is set
.
.
.
commit
|
commitdiff
|
tree
2017-04-07
L
a
u
r
e
n
t
G
oubet
M
i
ssi
n
g about
.
html in mul
t
iple plugins
commit
|
commitdiff
|
tree
2017-04-07
Laurent Goubet
Make sure we canno
t
im
p
ort unsupported guava version
s
commit
|
commitdiff
|
tree
2016-12-08
Lau
r
ent Goubet
swi
t
ch neo
n
tp to fixed
u
pdate sites
commit
|
commitdiff
|
tree
2016-11-22
Laurent Goubet
Use obeo's github
i
nstead
o
f axel
'
s
commit
|
commitdiff
|
tree
2016-11-21
Laurent Goubet
Use
tycho 0
.
26
commit
|
commitdiff
|
tree
2016-11-03
La
u
rent Goubet
Don't build th
e
u
p
date site unl
e
ss it's usin
g
th
e
la
t
est tp
commit
|
commitdiff
|
tree
2016-11-03
Laurent Gou
b
e
t
First vers
i
on o
f
an Oxy
g
en tp
commit
|
commitdiff
|
tree
2016-07-25
Ma
r
tin
Fleck
[
4
9
7
066] 'Problems' tab should
n
ot be shown auto
m
atica
l
ly
.
.
.
commit
|
commitdiff
|
tree
2016-07-25
Alexandr
a
Buz
i
l
a
[494763] - Stere
o
types not displayed in SMV
commit
|
commitdiff
|
tree
2016-07-12
L
aurent Goubet
Do no
t
c
onsider a
c
o
n
tai
n
er deletion to conflict wit
h
.
.
.
commit
|
commitdiff
|
tree
2016-07-11
La
u
re
n
t Delaigu
e
[497492
]
F
ix N
P
E in tool
t
ip pr
o
vider
commit
|
commitdiff
|
tree
2016-07-07
Laurent Goubet
update tp to fo
l
low
U
ML de
s
igner
commit
|
commitdiff
|
tree
2016-06-14
Laurent
G
o
u
be
t
[495961]
inc
o
mpat
i
bility b
e
t
wee
n
log4j 1
.
x
and
2
.
x
commit
|
commitdiff
|
tree
2016-05-24
Laurent Goubet
[4
7
1157] Stac
k
Overflow sti
l
l present on Sir
i
u
s
d
iagrams
commit
|
commitdiff
|
tree
2016-05-19
Laurent G
o
ubet
F
ix localization for papyrus support plugin
commit
|
commitdiff
|
tree
2016-02-15
S
tefan Dirix
[47
3
985] Enab
l
e
c
omparison dialog
i
n
p
ure e4
commit
|
commitdiff
|
tree
2016-02-08
Laur
e
nt Goubet
Cope with API
c
h
ange
s
i
n Papyrus
commit
|
commitdiff
|
tree
2016-01-21
La
u
re
n
t
Go
u
b
et
targ
e
t p
l
atfor
m
for Neon
commit
|
commitdiff
|
tree
2015-10-19
Axel Richa
r
d
[475586] Reject sub-diffs of rejected diffs
when casc
a
ding
.
.
.
commit
|
commitdiff
|
tree
2015-08-18
Lauren
t
Goubet
Bu
m
p v
e
rsion
f
o
r
n
eon M1
commit
|
commitdiff
|
tree
2015-08-18
Lau
r
ent Goubet
Clos
i
ng internal package from API
commit
|
commitdiff
|
tree
2015-07-31
Laure
n
t Goubet
Only mark c
o
nflictin
g
files as c
o
nflicting in
s
tead
.
.
.
commit
|
commitdiff
|
tree
2015-07-31
Laurent
G
ou
b
et
F
u
nct
i
onal t
e
sts for th
e
remote resol
v
ing and a
s
s
oc
i
a
ted
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Axel Richard
N
ew
E
M
F
C
ompare s
p
ec
i
fications plugin
commit
|
commitdiff
|
tree
2015-06-22
A
x
e
l
Richard
[4534
0
8
] Fix S
W
TExcep
t
i
o
n
i
n EMFCSMV#internalRedraw()
commit
|
commitdiff
|
tree
2015-06-22
A
x
el
R
i
c
hard
[
4703
9
6] Fix
N
PE in Compare
T
o
o
lBar#set
E
nabled(boole
a
n)
commit
|
commitdiff
|
tree
2015-06-19
Laurent G
o
ub
e
t
revert
changes
t
o the doc
p
u
b
lis
h
er
commit
|
commitdiff
|
tree
2015-06-18
Lau
r
ent
Goubet
re
s
tore p2
-
pl
u
g
i
n, r
e
name website zip
commit
|
commitdiff
|
tree
2015-06-18
P
h
ilip Langer
Re
f
actors th
e
EMFR
e
sourc
e
M
appingMerger
commit
|
commitdiff
|
tree
2015-06-18
L
aurent G
o
ubet
do
c
issues - re
s
tore
p
acking
,
remov
e
m
e
tadata modification
commit
|
commitdiff
|
tree
2015-06-18
Laurent Goubet
doc issu
e
s - te
s
t - Remove normaliz
e
commit
|
commitdiff
|
tree
2015-06-18
L
a
u
rent Goubet
doc iss
u
es - tes
t
- Rem
o
ve signin
g
an
d
packing
commit
|
commitdiff
|
tree
2015-06-18
A
xel Richard
[RelEng] Update tycho from 0
.
2
1
t
o
0
.
23
commit
|
commitdiff
|
tree
2015-06-18
A
xel Richard
[RelEng]
U
pd
a
te jarsigner ve
r
si
o
n f
r
o
m
1
.
0
.
5 to 1
.
1
.
2
commit
|
commitdiff
|
tree
2015-06-18
Axel Ric
h
ar
d
Add new
UML
D
anglingStereotypeApplication concept
commit
|
commitdiff
|
tree
2015-06-17
Axel Ric
h
ard
[469355] F
i
x
c
o
n
flicts label
shows wrong
number of
.
.
.
commit
|
commitdiff
|
tree
2015-06-08
Axel Richard
[
D
oc] Updat
e
g
e
nerat
e
d quali
f
ied version f
o
r
w
ebs
i
te
commit
|
commitdiff
|
tree
next