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
Make sure folders are created when extracting input files
2020-11-24
lgoubet
M
a
ke sure f
o
l
d
ers
are created when extracti
n
g input
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgoub
e
t
Bump
version
s
to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
l
goubet
Do
n
ot close the repos
i
t
o
ry, getRepositor
y
Cach
e
()
.
clear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Allow
l
oa
d
ing of mo
d
e
ls u
s
ing
I
D
a
t
t
r
i
butes for comparison
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Compati
b
ility recent mockito
commit
|
commitdiff
|
tree
2020-10-04
lgoubet
Only consider files we've
e
xtr
a
cted
as po
t
e
ntial test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
Dele
t
e sub-pro
j
ect
s
first when
cleanin
g
up t
e
st workspa
c
e
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Bump Ver
s
ions to 3
.
3
.
12
commit
|
commitdiff
|
tree
2020-07-22
l
g
oubet
Fix name
o
f 2019-12
target
p
latfor
m
commit
|
commitdiff
|
tree
2020-05-26
l
g
o
u
bet
Bump v
e
r
si
o
ns to 3
.
3
.
11
commit
|
commitdiff
|
tree
2020-01-14
l
g
o
u
bet
B
ump update sit
e
s to 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lgou
b
e
t
Bump EMF Compare to
3
.
3
.
10
a
nd ad
d
2019-12 target platfor
m
commit
|
commitdiff
|
tree
2020-01-06
lgoube
t
Prevent
NPE from the closin
g
of a Comparison Dialog
commit
|
commitdiff
|
tree
2020-01-06
lgoubet
Co
m
patibility with
J
Git 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgo
u
bet
Potent
i
al NP
E
w
h
en switching
f
i
l
e
s in th
e
comp
a
re dialog
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Re-
e
nabl
e
signing and tycho-p2-plu
g
in
,
s
w
itch w
e
bsite
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Buil
d
t
e
s
ting
- di
s
a
bl
e
tycho-p2-plugin
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
B
u
ild testing - disable e
c
l
i
p
se jarsigne
r
commit
|
commitdiff
|
tree
2019-09-24
lgoubet
EMF
C
ompare documentation jar is uns
i
gned
commit
|
commitdiff
|
tree
2019-09-19
lgoube
t
Replace Gua
v
a with Java
8
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
Potential race c
o
nditio
n
when loading EPacka
g
es for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
Potentia
l
N
PE with some i
m
plementations of t
h
e property
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Some imp
l
e
m
entations of Re
s
o
u
rc
e
.
Diagnostic m
a
y
return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
g
oubet
EMF Compare does not s
u
p
port relat
i
ve
xsi:
s
chemaLoca
t
io
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
A
P
I compati
b
ility
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Remov
e
pa
r
t of guava uses
commit
|
commitdiff
|
tree
2019-09-18
lgoub
e
t
B
u
mp to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Open the
c
ompare navigat
a
ble as
int
e
rnal API
commit
|
commitdiff
|
tree
2019-09-18
lg
o
ub
e
t
Register the navigatable so that t
h
e toolbar actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgoubet
The navigatabl
e
's cache
needs to
b
e cleared
when we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lg
o
ubet
The Mat
c
h
E
ngineFactory doesn't
m
a
ke use of its setters
commit
|
commitdiff
|
tree
2019-09-16
lg
o
ubet
Happy
c
hecksty
l
e
commit
|
commitdiff
|
tree
2019-09-11
lgoube
t
Upd
a
te setup file
commit
|
commitdiff
|
tree
2019-09-10
lgoube
t
T
a
r
g
et plat
f
orm b
a
se
d
on 2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Beh
a
v
i
o
r change in 2019-06 - Exceptions are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lg
o
ubet
Remove the 32 bit platforms for
our target configurations
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index issue
when merging non-uniq
u
e a
t
t
ribut
e
s' e
l
ements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
D
i
ffs depen
d
ing
o
n pseudo-co
n
flicts do not r
e
j
e
ct the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MOV
E
differences also n
e
e
d
to tak
e
into account
the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
Inaccu
r
at
e
c
o
n
f
lic
t
detectio
n
f
or moves in no
n
-
contai
n
m
e
n
t
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
M
o
ves with
n
on-uniqu
e
values and ad
d
i
tion/deleti
o
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
O
nly MOVE diffs n
e
ed to b
e
i
gnored when
comput
i
ng the
LCS
commit
|
commitdiff
|
tree
2019-09-04
lgo
u
bet
Conflict detectio
n
on index
changes
must tak
e
Fe
a
t
u
reFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
M
ak
e
sure the UI won't tr
y
to compute t
h
e LCS
f
or huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The
"accept/r
e
je
c
t
"
all non-confl
i
cting action shouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lg
o
ubet
Fix diff, conflic
t
detecti
o
n and mergi
n
g
o
f non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Potential out
o
f
bounds ex
c
eption
commit
|
commitdiff
|
tree
2019-08-27
lgoube
t
Com
p
atibility with jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Performanc
e
- use DiffCrossReferen
c
er w
h
e
n pos
s
ible
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
regr
e
s
s
ion - right-click actio
n
s on single diff
s
elections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgo
u
bet
Open SMV API to allow implementers to access
the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgo
u
bet
Prevents excepti
o
n
s
from
b
eing throw
n
from th
e
viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lg
o
ubet
Pe
r
forma
n
ce - use streams instead o
f
guav
a
itera
t
ion
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgo
u
bet
Perf
o
rmance - remove usele
s
s gu
a
va trans
f
orm
a
tion
commit
|
commitdiff
|
tree
2019-07-17
Christian W
.
Damus
[
522080]
[UML] Add-add conflicts in stereot
y
pe application
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
lgou
b
et
Fix detection of
p
seu
d
o c
o
nf
l
icts on single-
v
alued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
goub
e
t
Regression on
the group
/
match ri
g
ht-click acti
o
ns in SMW
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
P
r
o
perly
describe what the
conflict resolvin
g
actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Ma
r
t
i
n F
l
e
ck
[
506928] C
o
mpar
i
sonScopeE
d
itorInput does not resp
e
c
t
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add Structur
e
Me
r
ge
V
iewer customization
opti
o
ns
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
Shortcut the UMLPostProcessor's subset implications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Axel Richard
Acti
v
a
tion
of all Git
t
ests
commit
|
commitdiff
|
tree
2019-07-16
lgoube
t
Prevent NPE from ov
e
rriden R
e
sour
c
e implementatio
n
s
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
Ignore
"
originalTargetObjects" f
r
om the EMF C
o
mpare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bum
p
versions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adapt tests t
o
EGit chang
e
of behavior
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
Enable us
e
rs to me
r
ge
a
l
l
conflicts at o
n
ce through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Mergi
n
g
single-valued contain
m
ent
c
h
anges can
lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
goube
t
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
et
P
r
event L
C
S c
o
mpu
t
ation w
h
en
we do not need ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lg
o
ubet
Pr
e
v
ent dup
l
icat
e
ins
e
rtion poin
t
s
to
b
e shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
l
g
o
ube
t
Prevent CM
V
dispo
s
al w
h
e
n user selects multiple ele
m
ents
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
Only add
new adapters w
h
e
n
needed
commit
|
commitdiff
|
tree
2019-04-14
lgoubet
Iterate o
v
e
r the
d
ifferences
i
nstead of the
m
a
tches
commit
|
commitdiff
|
tree
2019-04-09
l
goubet
Prevent OutOfMemoryEr
r
ors from
the UI when switching CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Perfor
m
anc
e
- Computing
r
equirem
e
nts times
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The UM
L
tests should
n
'
t
u
se a cache
d
instance of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lgoubet
Restore possibil
i
ty to r
e
move me
r
g
ers
fro
m
th
e
regi
s
try
commit
|
commitdiff
|
tree
2019-03-22
l
g
o
u
b
e
t
Make sure we hook the UI when users prov
i
de
a
prec
o
mputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
l
g
oubet
Bump EMF Comp
a
re to 3
.
3
.
7 in
preparat
i
on for 2019
-
06
commit
|
commitdiff
|
tree
2019-03-21
lgou
b
et
Dispos
i
ng of the
c
o
mpa
r
ison
shouldn't be don
e
by t
h
e SMV
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump version
s
for 3
.
3
.
6
f
or 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
pa
t
c
h
M
od
e
lG
i
tMergeEditorIn
p
ut for
E
G
it 5
.
3
.
0 co
m
patibi
l
i
t
y
commit
|
commitdiff
|
tree
2019-02-26
lg
o
u
bet
S
u
ppress guav
a
ne
s
t
ed concatenations
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Re
m
ove accidental
u
s
e of
G
u
ava
commit
|
commitdiff
|
tree
2019-02-11
lg
o
ubet
SWTExcep
t
ion when s
w
i
tch
i
ng comparisons in a compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgo
u
bet
Allo
w
clients t
o
provide
p
re-computed
compar
i
sons
t
o
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ignore fai
l
ing git tests for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump
ver
s
ions to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
l
g
o
ubet
Use
a relea
s
ed version of Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[541730
]
Reverts d
5
9c924 d
u
e to an UI
freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump feature v
e
rsions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
b
u
mp v
e
rsions
commit
|
commitdiff
|
tree
2018-06-22
Stéphan
e
T
hibaudeau
Extensi
o
n point to pro
v
ide specif
i
c matching rul
e
s
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Th
i
baudea
u
E
M
F
C
o
mpare
is compatible with JGit 5
.
* versio
n
s
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thibaudeau
Add
e
x
p
licit de
p
e
n
dency t
o
o
rg
.
ecli
p
s
e
.
g
ef
commit
|
commitdiff
|
tree
2018-06-22
Stéph
a
ne Thibaudeau
Do not m
i
nimize identical reso
u
rces when
Xtext is used
commit
|
commitdiff
|
tree
2018-06-22
S
t
éphane Thibaudeau
Use white-list s
t
rategy to retrie
v
e the Model pro
v
i
der
commit
|
commitdiff
|
tree
2018-06-22
Stéphane
Thibaud
e
au
Better handling of Xtext
with Live sc
o
pe
o
pt
i
on
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EMF Compar
e
is no lon
g
e
r
com
p
atible with egit <
4
.
2
commit
|
commitdiff
|
tree
next