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
Cannot merge added/deleted resources
2021-10-14
l
goubet
Cannot mer
g
e added/deleted resources
commit
|
commitdiff
|
tree
2021-10-07
lgoubet
B
u
mp version to
3
.
3
.
16
commit
|
commitdiff
|
tree
2021-10-07
lgo
u
bet
switc
h
t
o latest jarsign
e
r
commit
|
commitdiff
|
tree
2021-10-07
lgoubet
2021-09 tp + 2021-12 milestone of EGit to cope with
.
.
.
commit
|
commitdiff
|
tree
2021-07-20
lgo
u
b
e
t
change vi
s
ibility o
f
th
e
resoluti
o
n context
commit
|
commitdiff
|
tree
2021-07-19
l
goub
e
t
Bump
vers
i
on
to 3
.
3
.
15
commit
|
commitdiff
|
tree
2021-07-19
lgoubet
Enable diagram post processor for GMF
1
.
10 and
a
bove
commit
|
commitdiff
|
tree
2021-07-16
lgo
u
bet
Fix release scrip
t
commit
|
commitdiff
|
tree
2021-07-16
l
goubet
fix relea
s
e
public
a
tion
s
c
r
ipt
commit
|
commitdiff
|
tree
2021-07-16
l
g
oubet
Add scrip
t
to publish r
e
leas
e
s for JIRO
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Fix de
l
e
t
e-c
h
a
nge c
o
n
f
lict
d
etection (at file level)
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
Prevent NPE from t
h
e title builder job
if run during
.
.
.
commit
|
commitdiff
|
tree
2021-07-16
lgoubet
S
witch to 20
2
1-06 tp and la
t
est
E
Git
version
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Use Unix line delimiter
s
for
s
h
e
ll
s
c
r
ipts
commit
|
commitdiff
|
tree
2021-02-23
lgoubet
Add script to publish mi
l
e
s
tones for JIRO
commit
|
commitdiff
|
tree
2021-02-23
lgo
u
bet
A
d
d nightly publicatio
n
sc
r
ipt for JIRO
commit
|
commitdiff
|
tree
2021-02-23
l
g
oubet
Open r
a
ng
e
s
to accept G
u
ava 30
.
1
commit
|
commitdiff
|
tree
2021-02-08
lgou
b
et
B
ump versio
n
to 3
.
3
.
1
4
commit
|
commitdiff
|
tree
2021-02-08
lgou
b
et
Do not close the repository when
cre
a
t
i
ng
t
h
e
E
MF merge
.
.
.
commit
|
commitdiff
|
tree
2021-01-05
lgoubet
Potenti
a
l NPE
commit
|
commitdiff
|
tree
2020-11-24
lgoubet
Make sure folders are created w
h
e
n
extracting input
.
.
.
commit
|
commitdiff
|
tree
2020-11-20
lgoubet
Bump v
e
r
sions
to 3
.
3
.
13
commit
|
commitdiff
|
tree
2020-11-19
lgou
b
et
Do
not
clo
s
e the
r
ep
o
sitory, getReposit
o
ryCache()
.
c
lear
.
.
.
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Allow loading
of model
s
using ID attribut
e
s
for comparison
commit
|
commitdiff
|
tree
2020-10-21
lgoubet
Com
p
atibility recent mockito
commit
|
commitdiff
|
tree
2020-10-04
lgou
b
et
Only
c
onsider
f
i
les we've extracted as pote
n
tia
l
test
.
.
.
commit
|
commitdiff
|
tree
2020-08-31
lgoubet
Delete
s
ub-projects f
i
r
s
t when
c
leaning up test
w
orkspace
commit
|
commitdiff
|
tree
2020-07-22
lgoubet
Bump Ve
r
sions to 3
.
3
.
1
2
commit
|
commitdiff
|
tree
2020-07-22
lgoub
e
t
Fix name
o
f 2019
-
1
2
target platform
commit
|
commitdiff
|
tree
2020-06-26
lgoubet
Fix G
i
tTestSupport
commit
|
commitdiff
|
tree
2020-05-26
lgou
b
e
t
Bump versions to 3
.
3
.
11
commit
|
commitdiff
|
tree
2020-04-21
lgoubet
Git test framew
o
r
k
faili
n
g on w
i
ndows
commit
|
commitdiff
|
tree
2020-01-14
lgoubet
Bump up
d
ate
sites to 3
.
3
.
10
commit
|
commitdiff
|
tree
2020-01-14
lg
o
ubet
Bump
E
MF C
o
mpare
t
o
3
.
3
.
10 and add 2019-12 t
a
rget platform
commit
|
commitdiff
|
tree
2020-01-06
lgoube
t
Prevent N
P
E from the cl
o
sing of
a
C
omparison Di
a
log
commit
|
commitdiff
|
tree
2020-01-06
lgou
b
et
Compati
b
ility with JGit 5
.
6
.
0
commit
|
commitdiff
|
tree
2019-11-05
lgoubet
Potential NPE when sw
i
tching
files in
t
h
e compare
d
ial
o
g
commit
|
commitdiff
|
tree
2019-11-05
l
g
oube
t
S
w
it
c
h EMF Compare t
o
G
uava
2
7
commit
|
commitdiff
|
tree
2019-09-25
lgo
u
bet
Re-en
a
b
l
e
sign
i
ng and tycho-p2
-
plugin, s
w
itch webs
i
te
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Bu
i
ld testing - disable tyc
h
o-p2-plugin
commit
|
commitdiff
|
tree
2019-09-25
l
g
ou
b
e
t
B
uild testing - dis
a
b
le ec
l
ip
s
e jarsigner
commit
|
commitdiff
|
tree
2019-09-24
lgoubet
EMF Compare docume
n
tatio
n
jar is unsigned
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Replac
e
Guava wi
t
h J
a
v
a
8
commit
|
commitdiff
|
tree
2019-09-19
lgoub
e
t
Potential race condition when
loadin
g
EPackages for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
g
o
ubet
Pote
n
tia
l
N
P
E w
i
th
some implem
e
ntations
of the property
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Some implementations of Resource
.
Diagno
s
tic may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
EMF Compare does not support relati
v
e xsi:schemaLo
c
ation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
l
go
u
bet
API compatibil
i
ty
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Remove part of guava
uses
commit
|
commitdiff
|
tree
2019-09-18
lgoub
e
t
Bump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Open th
e
c
o
mpare na
v
igatable as internal AP
I
commit
|
commitdiff
|
tree
2019-09-18
lg
o
ube
t
Registe
r
the
n
avigatable s
o
that
t
he
toolbar actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lg
o
ube
t
T
h
e naviga
t
able's cache needs to be cleared when w
e
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
l
g
o
ubet
The MatchEngineFactory doesn't
m
ake
u
se of
i
ts setters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
H
a
p
py checkstyle
commit
|
commitdiff
|
tree
2019-09-11
l
g
oubet
U
p
d
ate set
u
p
file
commit
|
commitdiff
|
tree
2019-09-10
l
goubet
Target
platform based on 2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Behavio
r
change
in 2
0
19-06 - Exce
p
t
ions
a
re
no
w
in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgo
u
bet
Remove the
3
2
bit
p
l
atforms for our targe
t
con
f
igura
t
ions
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
b
e
t
Index issue
wh
e
n merging
n
on-uniq
u
e
at
t
r
ibutes'
e
lements
commit
|
commitdiff
|
tree
2019-09-06
lg
o
u
b
et
Diffs depending on pseudo-conflic
t
s
d
o
n
ot
r
eject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
MO
V
E differe
n
ces
a
lso need to
t
a
ke into account the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inac
c
urate
c
on
f
lict det
e
ction for mo
v
es in
n
o
n-contain
m
ent
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Moves with non
-
u
niq
u
e values a
n
d
addition/deletions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
g
ou
b
et
O
n
ly MOVE
diffs need
t
o
be ignored when
c
omput
i
n
g
the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoub
e
t
Confl
i
ct
d
et
e
c
tion on index changes must
t
ake Featu
r
eFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Ma
k
e sure the
U
I
w
on't try to compute the LCS fo
r
huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The "ac
c
ept/
r
ej
e
ct" all non-
c
onfl
i
cting action shouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
goubet
Fi
x
diff,
confl
i
ct
d
etecti
o
n
and mergin
g
of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Potential out of
bounds exception
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Compatibility with jg
i
t 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
l
g
oubet
Performance - use DiffCrossReferencer when possible
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
r
egression -
right
-
click actions
o
n single dif
f
se
l
ections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Op
e
n SMV
API
t
o allow impl
e
men
t
ers to access t
h
e raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgou
b
et
Preven
t
s
e
xceptions from being thrown from
t
h
e
viewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
Performa
n
ce - u
s
e s
t
reams instead of gu
a
va iteratio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
P
erformance - remove us
e
le
s
s guava t
r
ansform
a
tion
commit
|
commitdiff
|
tree
2019-07-17
lgo
u
bet
Fix de
t
ection o
f
pse
u
do conflicts on si
n
gl
e
-
valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
Regress
i
on on the group
/
match right-cl
i
ck action
s
in SMW
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
Pr
o
perly
describe what the co
n
f
lict r
e
s
o
lvin
g
a
cti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoube
t
Ad
d
St
r
uctureMergeViewer customiza
t
ion options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Sh
o
rtcut th
e
UMLPos
t
Pr
o
ce
s
s
or'
s
s
u
bset implications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Prev
e
nt NPE from overriden
Resource implementati
o
ns
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Igno
r
e
"originalTargetObjects" fr
o
m the EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoub
e
t
Bum
p
versi
o
ns to
3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
A
d
apt tests to EGit change of beh
a
vior
commit
|
commitdiff
|
tree
2019-05-29
lgoubet
Enable users to merge all conflict
s
a
t
once thr
o
ugh
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Mer
g
ing single
-
valued containment changes can lea
d
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Typo
s
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prevent LCS
c
o
mput
a
tion when we do not need
or
d
eri
n
g
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prevent du
p
licate insertio
n
poi
n
ts to be
shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
l
g
oubet
Prevent CMV disposal when user selects multiple elements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
Only
add new adap
t
ers when needed
commit
|
commitdiff
|
tree
2019-04-14
l
goub
e
t
It
e
rat
e
over the dif
f
eren
c
e
s
instead of
t
h
e
match
e
s
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Prevent OutOfMe
m
ory
E
r
rors
from the UI when switch
i
ng C
M
V
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Performanc
e
- Computing require
m
ents times
commit
|
commitdiff
|
tree
2019-04-08
lgo
u
b
e
t
The U
M
L tests sho
u
ld
n
't
u
se a cach
e
d instanc
e
of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lgoube
t
Re
s
tore
p
ossibility
t
o remove
m
ergers
from the registry
commit
|
commitdiff
|
tree
2019-03-22
lgo
u
bet
Ma
k
e sure
we hook th
e
UI whe
n
users provi
d
e a p
r
e
c
ompute
d
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Bump EMF
C
om
p
are to 3
.
3
.
7
i
n prepara
t
ion for
20
1
9-06
commit
|
commitdiff
|
tree
next