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
Re-enable signing and tycho-p2-plugin, switch website to antrun
2019-09-25
l
g
ou
b
et
Re-
e
n
a
b
l
e sig
n
ing and t
y
cho-p2-
p
l
u
gin,
switch web
s
i
te
.
.
.
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
Build testing - dis
a
ble
tych
o
-p2-
p
l
ugin
commit
|
commitdiff
|
tree
2019-09-25
lgoubet
B
uild testing - dis
a
ble eclipse jarsigner
commit
|
commitdiff
|
tree
2019-09-24
lgoubet
EMF Com
p
are
d
ocum
e
ntat
i
o
n j
a
r
i
s
u
nsigned
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Replace Guav
a
with Java 8
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
P
otential race conditio
n
when load
i
ng
EP
a
cka
g
e
s
for
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
Po
t
e
ntial
N
PE with s
o
me implementation
s
of
the pro
p
erty
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Some implementations of
R
es
o
urce
.
Diagnostic may return
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
EMF Comp
a
re does no
t
supp
o
rt
re
l
a
ti
v
e xsi
:
s
c
hemaL
o
cation
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lg
o
ubet
API
compatibility
commit
|
commitdiff
|
tree
2019-09-18
lgou
b
et
R
emove part of gu
a
va us
e
s
commit
|
commitdiff
|
tree
2019-09-18
l
goub
e
t
Bump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Op
e
n the compare navigatable as internal AP
I
commit
|
commitdiff
|
tree
2019-09-18
lg
o
ube
t
Registe
r
th
e
n
aviga
t
ab
l
e so t
h
at the tool
b
ar actions
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgo
u
b
e
t
The
n
avigatable's
cache needs to be cleared when we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgo
u
bet
The MatchEngineF
a
ctor
y
d
o
e
sn't make use of
i
t
s setters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
Happy c
h
eckstyle
commit
|
commitdiff
|
tree
2019-09-11
lgo
u
b
e
t
Update setup
f
i
l
e
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
Target plat
f
orm
b
ased o
n
2019-06
commit
|
commitdiff
|
tree
2019-09-10
lgoub
e
t
B
eh
a
vior
change in 2019-06 -
E
xceptions are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoub
e
t
Rem
o
ve the 32 bit platforms
f
o
r our target co
n
fi
g
u
rations
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index
i
ssue when merging non-unique attributes' elem
e
nts
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diff
s
dep
e
n
d
ing
o
n p
s
eudo-conflicts
d
o not reject
the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
goubet
MOVE dif
f
erences also need
to
ta
k
e int
o
accou
n
t the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inaccu
r
a
te conflict d
e
t
e
cti
o
n
for
move
s
in non-co
n
tainment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Moves with non-unique values and addi
t
ion/delet
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Only
M
O
V
E
d
i
ffs
need to be
i
gnored whe
n
computing
t
he
LCS
commit
|
commitdiff
|
tree
2019-09-04
lgo
u
bet
C
o
nflict detection on index changes must take
Feature
F
il
t
er
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make sure
t
he UI wo
n
'
t
try
t
o
compute
t
he LCS for
h
u
g
e
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lg
o
u
b
et
The "accept/reject" all non-co
n
flicting
action sho
u
ldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgou
b
e
t
F
ix diff, conflict detect
i
o
n and merging
o
f no
n
-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lg
o
ubet
Potent
i
al out of boun
d
s excep
t
ion
commit
|
commitdiff
|
tree
2019-08-27
lgou
b
et
Comp
a
tibility
w
i
th
j
git 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
l
g
o
ubet
Pe
r
formanc
e
- use DiffCrossRefere
n
cer when possi
b
l
e
commit
|
commitdiff
|
tree
2019-08-22
lgoub
e
t
regression - right-clic
k
act
i
ons on single diff sel
e
ctions
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open SMV A
P
I to allo
w
implement
e
rs
to access the
r
aw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Pre
v
ents exc
e
ptio
n
s
fr
o
m being thrown fro
m
the vi
e
we
r
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoube
t
P
erformance - use stream
s
instead of
gua
v
a i
t
e
r
at
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
g
oubet
Performance - r
e
move u
s
eles
s
guava t
r
ansf
o
r
mati
o
n
commit
|
commitdiff
|
tree
2019-07-17
l
g
o
ub
e
t
Fix detection of
p
seudo c
o
nflicts on s
i
ngle-value
d
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoube
t
Regression
o
n
the gr
o
up/match
rig
h
t-c
l
ick actions in SM
W
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Properly descri
b
e wh
a
t th
e
c
onflict resolving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add Struc
t
ureMergeViewer cust
o
mizatio
n
options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortcut
the UMLPo
s
tProcessor's subset im
p
lic
a
t
i
ons
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
Prevent NPE from ove
r
ride
n
Resourc
e
implementations
commit
|
commitdiff
|
tree
2019-07-16
lg
o
ubet
I
g
n
ore "origin
a
l
T
argetOb
j
ect
s
" from the EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lg
o
u
b
e
t
Bump versi
o
ns to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoubet
Adap
t
tests to EGit chang
e
of behavio
r
commit
|
commitdiff
|
tree
2019-05-29
l
gou
b
et
E
n
able users to merge a
l
l conflicts
at once
t
hrough
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Mergi
n
g
single-v
a
lued co
n
tainment ch
a
nges can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
g
oubet
T
y
pos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prevent
L
CS com
p
u
tation when we do
n
o
t
need ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prevent d
u
p
licate
inserti
o
n
p
o
ints to be sh
o
wn in t
r
ee
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
Prevent CMV disposal when
u
s
e
r sel
e
cts
m
u
lt
i
p
l
e elements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgo
u
bet
Only
a
dd ne
w
adapt
e
rs when needed
commit
|
commitdiff
|
tree
2019-04-14
l
g
oube
t
Iterate over the
differences instead of the
m
atches
commit
|
commitdiff
|
tree
2019-04-09
l
goubet
Prevent OutOfMemoryErrors from the
U
I when s
w
itching CMV
commit
|
commitdiff
|
tree
2019-04-08
lgou
b
et
Pe
r
forman
c
e
- Comp
u
ting requirements t
i
me
s
commit
|
commitdiff
|
tree
2019-04-08
l
goubet
T
he
U
ML tests shouldn
'
t use
a cached in
s
ta
n
c
e
of EM
F
C
o
m
pare
commit
|
commitdiff
|
tree
2019-04-03
l
gou
b
et
Re
s
tore possi
b
ility
t
o
remo
v
e mergers fro
m
the re
g
istry
commit
|
commitdiff
|
tree
2019-03-22
l
go
u
bet
Ma
k
e sur
e
we hook the UI when users pr
o
vide a
p
re
c
ompu
t
ed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
l
goubet
Bum
p
E
MF Com
p
are to 3
.
3
.
7 in p
r
eparation for
2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Disposing of the compa
r
ison
shoul
d
n't be done by t
h
e SMV
commit
|
commitdiff
|
tree
2019-03-04
l
g
oubet
Av
o
id Cla
s
sCa
s
tExce
p
tio
n
when merging fea
t
ure m
a
p c
h
anges
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump ve
r
sions
f
o
r 3
.
3
.
6
f
or 201
9
-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
patch ModelGitMergeEditorInput f
o
r
E
Git 5
.
3
.
0 co
m
p
ati
b
ility
commit
|
commitdiff
|
tree
2019-02-26
lgo
u
b
e
t
Suppress guava nested
concatenati
o
ns
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove accidental us
e
of
G
uava
commit
|
commitdiff
|
tree
2019-02-11
lg
o
ubet
S
WTException
whe
n
switching comparisons in a compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgou
b
et
Allow c
l
ients to provide pre-computed com
p
a
r
isons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
l
g
ou
b
et
Ig
n
ore failing git t
e
sts for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump v
e
r
s
ions
to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use a release
d
ver
s
ion of Sirius
commit
|
commitdiff
|
tree
2018-11-30
l
g
oubet
[541730] Reverts d59c92
4
d
ue to an UI f
r
ee
z
e
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump feature
v
e
rs
i
o
ns
commit
|
commitdiff
|
tree
2018-06-22
l
g
oubet
bump versions
commit
|
commitdiff
|
tree
2018-06-22
l
g
oubet
EMF
C
om
p
are is no
l
o
n
ger compat
i
ble with egit < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
l
goubet
Intro
d
uce test fo
r
m
e
rges with multiple ancestors
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
Removing th
e
subversive in
t
egration p
l
ugins
commit
|
commitdiff
|
tree
2018-01-30
lgo
u
bet
Bum
p
p
lugin and feat
u
re
v
ers
i
ons for Pho
t
on
commit
|
commitdiff
|
tree
2018-01-24
lgoub
e
t
Removing the Pap
y
rus plugins and f
e
atures from
the
.
.
.
commit
|
commitdiff
|
tree
2013-07-12
lgoubet
[4
1
073
7
]
p
r
eserve o
r
dering eve
n
for equivalent dif
f
ere
n
c
es
.
commit
|
commitdiff
|
tree
2013-01-18
lgo
u
bet
[367475] Take git
spec
i
fic
i
ties into acc
o
unt when res
o
lving
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
l
g
oubet
Renaming ResourceTravers
a
l into
StorageTr
a
v
ersal to
commit
|
commitdiff
|
tree
2012-10-31
lg
o
ubet
Display a proper name f
o
r
th
e
r
e
f
e
re
n
ces whe
n
t
h
e diff
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
l
g
oubet
info
r
m
ation
returned if t
h
e logical mo
d
el resolut
i
on
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lg
o
u
bet
U
se the same
ellision for Attribute and referen
c
e labels
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Properly display
d
iffer
e
nce
that ar
e
n
o
t
directly
refined
commit
|
commitdiff
|
tree
2012-10-22
lgoube
t
Pre
v
e
n
t
merging
t
owards the git
i
ndex (or
other re
m
ote
.
.
.
commit
|
commitdiff
|
tree
2012-10-22
lgoubet
Low
e
r the number of
threads :
o
ur bottlen
e
ck is the
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
Wh
e
n
r
estructuring the match mod
e
l
commit
|
commitdiff
|
tree
2012-10-19
lgo
u
bet
This has n
o
thing to do as
p
ackage v
i
sib
l
e
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
Make Re
s
ourceTr
a
versal, Resource
U
til and StorageURICo
n
v
e
rt
e
r
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoub
e
t
Lo
a
d the r
i
ght versions of th
e
distant
file
s
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
The UI sho
u
ld use post processors
commit
|
commitdiff
|
tree
2012-10-19
lgoube
t
av
o
i
d
double sc
h
eme
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
Always preve
n
t load : ecore tends to load
new
r
esources
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lgou
b
et
Leave th
e
possib
i
lity for sub-classe
to not have a
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lgoube
t
Sup
p
r
essing
u
navoidable war
n
ing
commit
|
commitdiff
|
tree
2012-10-15
lg
o
ubet
Comment
i
ng
,
and
reducing the nestin
g
count of
g
et
D
ELOrigin
V
a
.
.
.
commit
|
commitdiff
|
tree
next