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
Remove the 32 bit platforms for our target configurations
2019-09-09
lgoube
t
Remove the 32
b
i
t platforms
for
o
u
r
target c
o
nfigurations
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
I
n
d
ex i
s
s
u
e
w
h
en merging non-unique attributes
'
elements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diff
s
dep
e
ndi
n
g on ps
e
udo-con
f
licts d
o
n
o
t reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOVE differences also
n
e
ed t
o
take into acc
o
unt the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoube
t
Inaccurat
e
c
o
nfli
c
t
detecti
o
n for moves in non-con
t
ainm
e
nt
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
g
oube
t
Moves with n
o
n-uniqu
e
values a
n
d a
d
dition/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
g
ou
b
et
Only MOVE diffs
need to b
e
ignore
d
when computing
t
he LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Confli
c
t det
e
c
t
i
on o
n
index changes must take
FeatureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make sure the UI
w
on't
t
ry
t
o
c
o
mpute the LCS for huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lg
o
ube
t
The
"
ac
c
e
pt/reje
c
t" a
l
l n
o
n-conflicting a
c
tion
s
h
ouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgou
b
et
Fix diff, con
f
lict dete
c
tion
and merging of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
l
goubet
P
otential out of bo
u
n
ds ex
c
eption
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Compat
i
b
i
l
ity
wit
h
jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Performance - use
DiffCros
s
Ref
e
r
e
n
c
e
r when poss
i
b
le
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
regress
i
on - right-click actions on sin
g
l
e
diff sel
e
ction
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
O
p
en SMV API
t
o allow im
p
lementers
t
o ac
c
ess the ra
w
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
g
oubet
Prevents excep
t
ions
from b
e
in
g
thrown from the v
i
ewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Performance -
use stre
a
ms i
n
s
tead of
g
uava iteration
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lg
o
ubet
P
e
r
fo
r
manc
e
- r
e
move us
e
less guava transformation
commit
|
commitdiff
|
tree
2019-07-17
lgoubet
Fix detectio
n
of pseudo conflicts on single-valu
e
d
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
oub
e
t
Regression on the
group/match r
i
g
h
t-
c
lick action
s
in SMW
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Pr
o
per
l
y
describ
e
what the co
n
flict resolving action
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add Struc
t
ureMergeViewer cu
s
tomizat
i
on options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortcut the UMLP
o
stP
r
ocessor's su
b
set implica
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Pr
e
v
e
nt NPE from over
r
iden Res
o
urce i
m
pleme
n
t
a
tions
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Ig
n
ore "ori
g
inalTargetObj
e
cts" from the EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bump versions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adapt tests to EGit chan
g
e o
f
beha
v
ior
commit
|
commitdiff
|
tree
2019-05-29
lg
o
ubet
E
n
able use
r
s to merge all conflicts at onc
e
t
h
rough
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
g
oub
e
t
Merging sin
g
le-valued
c
o
ntai
n
ment chan
g
es can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
et
Prevent LCS co
m
putatio
n
whe
n
we do not nee
d
ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prevent duplicate in
s
e
rtion points
t
o be s
h
own
in
tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lg
o
ubet
P
r
e
v
ent CMV
d
isposal when us
e
r selects multiple
e
le
m
ents
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
O
nly a
d
d new
a
d
a
pters w
h
e
n
needed
commit
|
commitdiff
|
tree
2019-04-14
lgou
b
et
Iterate over
the differe
n
ces instead of the
matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
P
rev
e
n
t OutOfMemo
r
yErrors
f
rom the UI when switchin
g
CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Performanc
e
-
Computing requirements times
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
T
he
UML te
s
ts shouldn't u
s
e a cache
d
i
n
st
a
nce o
f
E
M
FComp
a
re
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Restore
p
ossi
b
i
lity to remove mergers from the reg
i
s
t
ry
commit
|
commitdiff
|
tree
2019-03-22
lgou
b
e
t
Ma
k
e su
r
e we hook the
UI
w
hen users provide a prec
o
mputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
l
goub
e
t
Bump E
M
F Compare to
3
.
3
.
7 in prep
a
ration for 2019-06
commit
|
commitdiff
|
tree
2019-03-21
l
goubet
Disposin
g
of
t
he compar
i
son shouldn't be done by th
e
SM
V
commit
|
commitdiff
|
tree
2019-03-04
lgoubet
Avoid C
l
assCast
E
xc
e
ption when mer
g
ing fe
a
t
u
re map changes
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
B
u
mp versions for 3
.
3
.
6 for 2019-
0
3
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
patch
M
od
e
lGitMergeEdi
t
orInp
u
t
f
o
r EGit 5
.
3
.
0 comp
a
tibi
l
ity
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppre
s
s guava nested conc
a
te
n
ations
commit
|
commitdiff
|
tree
2019-02-11
lg
o
ubet
Remov
e
accidental use of Guava
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWTEx
c
ept
i
on
when sw
i
tching comparisons
i
n
a
c
omp
a
re
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lg
o
ubet
A
l
l
ow cli
e
nts
to provide p
r
e-compute
d
comparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
I
gno
r
e faili
n
g git te
s
ts for now
commit
|
commitdiff
|
tree
2018-12-03
lgoub
e
t
Bu
m
p versions
t
o
3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
l
g
oubet
Use a released ver
s
ion
of Sirius
commit
|
commitdiff
|
tree
2018-11-30
lg
o
u
bet
[541730] R
e
verts d
5
9c924 due to an UI f
r
eeze
commit
|
commitdiff
|
tree
2018-06-22
l
goub
e
t
bump feature v
e
rsions
commit
|
commitdiff
|
tree
2018-06-22
lgoub
e
t
bump versi
o
ns
commit
|
commitdiff
|
tree
2018-06-22
lgo
u
bet
EMF
C
om
p
are is no longer c
o
mpatible with egit < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgo
u
bet
Introduce test f
o
r
m
erges with
m
ul
t
iple anc
e
s
to
r
s
commit
|
commitdiff
|
tree
2018-03-19
L
a
uren
t
Goubet
P
roxy loading
f
rom the merge tool
commit
|
commitdiff
|
tree
2018-03-16
Laure
n
t
G
o
ubet
Allow
proxy reso
l
ution fr
o
m th
e
E
MF Comp
a
r
e
content
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
Allow proxy reso
l
u
tion from the E
M
F Compare
structu
r
e
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Lau
r
ent Go
u
bet
SMV action
to reveal all dif
f
erenc
e
s
in conflict with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
A
d
d act
i
ons t
o
merge ever
y
thing to "get ri
g
ht"
o
r
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laure
n
t Goubet
No changes shown
w
hen there is an adde
d
Sirius diagr
a
m
commit
|
commitdiff
|
tree
2018-03-13
L
aurent Goubet
Memory leak f
r
om the EMFMode
l
Provide
r
.
c
o
nt
e
xtT
o
R
e
s
ourceMappi
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent
Goubet
Memory leak
s
when com
p
a
r
ing
S
iri
u
s
di
a
gram
s
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
Removin
g
t
h
e subversive int
e
gration plugins
commit
|
commitdiff
|
tree
2018-03-13
Lau
r
ent
G
o
u
b
e
t
XMI files
a
r
e
not always mo
d
els
commit
|
commitdiff
|
tree
2018-03-13
L
a
u
rent Goubet
Memory
leak
d
u
r
i
ng automatic merg
e
operation
s
fro
m
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goube
t
D
on't return null from ITypedElement
.
getName()
.
commit
|
commitdiff
|
tree
2018-03-12
Lau
r
en
t
Goubet
[
53
2
069] Invalid
l
ogical model
for Syn
c
h
ronize with
.
.
.
commit
|
commitdiff
|
tree
2018-01-30
l
goubet
Bump plugin and
featur
e
versions for P
h
oton
commit
|
commitdiff
|
tree
2018-01-24
lgoub
e
t
Removing the Papyru
s
plugin
s
and fe
a
tures
fro
m
the
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Lau
r
ent Goubet
API break in JGit 4
.
9 due to
t
he fix for b
u
g 51712
8
commit
|
commitdiff
|
tree
2017-09-08
Laurent
G
oub
e
t
[510
4
20] Adding miss
i
ng extension point definitions
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Laurent Goube
t
[515591]
T
r
y and fi
x
random test failures
commit
|
commitdiff
|
tree
2017-09-07
Laurent G
o
u
b
et
performan
c
e plugin issues
commit
|
commitdiff
|
tree
2017-08-31
Laurent Goubet
[521358] documentation for
EMFCompareRCPPlugin missing
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Laure
n
t Goubet
B
umping
v
e
rsions for Oxygen
.
1
commit
|
commitdiff
|
tree
2017-08-23
L
au
r
ent Gou
b
e
t
R
e
moving non function
a
l profi
l
es fro
m
p
om
commit
|
commitdiff
|
tree
2017-08-22
Laurent Goubet
Sepa
r
ate core
&
ext
r
a builds
commit
|
commitdiff
|
tree
2017-07-07
Laurent Goubet
[
51861
2
] Frequen
t
CME fr
o
m the
a
dapter fa
c
to
r
y dispos
a
l
commit
|
commitdiff
|
tree
2017-07-06
Laurent Goubet
Use the rel
e
ased vers
i
o
n
o
f
E
Git
commit
|
commitdiff
|
tree
2017-06-12
Laurent
Goubet
"spy"
i
ng is th
e
root cause of a huge memory leak
commit
|
commitdiff
|
tree
2017-06-06
Lauren
t
Goubet
Revert "
R
efactorings to improve perfo
r
mance of MatchUtil"
commit
|
commitdiff
|
tree
2017-06-06
La
u
rent
G
oubet
Revert "Use more efficient feature lo
o
k
-
u
p
i
n
R
eference
U
til"
commit
|
commitdiff
|
tree
2017-05-11
Lauren
t
Goube
t
[51
6
3
45] Inconsiste
n
cy with
t
h
e logical model resol
u
tion
commit
|
commitdiff
|
tree
2017-05-11
Laurent Goub
e
t
Com
p
atibility
with guava 21
commit
|
commitdiff
|
tree
2017-05-09
Laurent
G
o
u
bet
[
5
1
5039] av
o
id thro
w
ing
e
x
c
e
p
t
i
ons
during reso
u
r
c
e
.
.
.
commit
|
commitdiff
|
tree
2017-04-07
L
a
ure
n
t Goubet
Bump
versions
f
o
r
EMF
Compare 3
.
3
.
1
commit
|
commitdiff
|
tree
2017-04-07
Laurent Goubet
Missing
a
b
out
.
html in multiple
p
l
ugins
commit
|
commitdiff
|
tree
2017-04-07
Laurent Goubet
Make sure we c
a
nnot
import unsupported
g
uava versi
o
ns
commit
|
commitdiff
|
tree
2017-02-10
Laur
e
nt
G
oubet
Try and give more m
e
mory
t
o o
u
r ov
e
rl
y
l
ong te
s
ts
commit
|
commitdiff
|
tree
2017-01-11
Laur
e
nt Goubet
[
5
094
1
3
]
Externalize string
s
for "Expand All" and
.
.
.
commit
|
commitdiff
|
tree
2016-12-08
Laurent Goubet
switch
n
e
o
n
tp to
fix
e
d update sites
commit
|
commitdiff
|
tree
2016-11-22
L
a
ur
e
nt Goubet
Use
obeo
'
s gith
u
b
inst
e
ad of a
x
el'
s
commit
|
commitdiff
|
tree
2016-11-21
Lauren
t
Goubet
Use tycho
0
.
2
6
commit
|
commitdiff
|
tree
2016-11-03
Laurent Goubet
D
on't build the update site
u
nless it's us
i
n
g
t
h
e
latest tp
commit
|
commitdiff
|
tree
2016-11-03
Laurent Goubet
First ve
r
sion of an Oxyg
e
n
tp
commit
|
commitdiff
|
tree
2016-09-14
Laurent Goubet
B
ump
v
ersions
f
o
r EM
F
C
ompare 3
.
3
.
0
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
next