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
Fix diff, conflict detection and merging of non-unique attributes
2019-08-30
lgoubet
Fi
x
diff,
c
onflict detecti
o
n
a
n
d merging of non-u
n
i
que
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoubet
Potential out of bound
s
exc
e
pt
i
on
commit
|
commitdiff
|
tree
2019-08-27
lgoub
e
t
Compatibili
t
y w
i
th j
g
it 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Pe
r
formance -
u
s
e
D
i
ffCross
R
eferencer wh
e
n po
s
sible
commit
|
commitdiff
|
tree
2019-08-22
l
go
u
bet
r
egress
i
o
n - right-click ac
t
ion
s
on single diff s
e
lections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgo
u
bet
Open SMV API to allow implemen
t
ers t
o
acces
s
t
h
e r
a
w
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
l
g
oubet
P
r
even
t
s
e
xceptions
from being
thrown from the vi
e
w
er
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
g
oubet
Pe
r
formance -
u
se s
t
rea
m
s ins
t
e
a
d of g
u
av
a
iterations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
g
o
ubet
P
erform
a
n
c
e - remove
u
s
eless
g
uava
tr
a
n
s
f
ormatio
n
commit
|
commitdiff
|
tree
2019-07-17
Christian W
.
Damus
[522080]
[UML] Add-add conflicts in ster
e
o
t
y
p
e appl
i
cation
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
l
g
oub
e
t
F
ix detection of pseudo conflicts o
n
s
i
ngle-val
u
ed
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Regression on the group/match right-click actions in SM
W
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
P
r
operly describe what the conflic
t
re
s
olving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Mar
t
in Fleck
[50692
8
] Compariso
n
Sc
o
peEditorInput
d
oes not respect
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
St
e
fan
D
irix
Can
c
el
F
a
ster in Proximi
t
yEObjectMatcher
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add Structure
M
e
r
geViewer customization options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortcut the UMLPostProcessor'
s
subs
e
t implications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Axel
R
ichard
Ac
t
i
v
ation of all Git t
e
sts
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
Prev
e
nt
N
PE from overriden R
e
so
u
rce implementations
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Ignore
"
originalTargetObjec
t
s
"
from the EMF Comp
a
re
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
l
g
ou
b
e
t
Bum
p
v
ersions to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
W
illiam Piers
Enabl
e
d "a
c
cept c
h
ange"
a
ctio
n
on multiple diff s
e
le
c
t
i
on
commit
|
commitdiff
|
tree
2019-07-04
lg
o
ubet
A
dapt tests to E
G
it change
o
f beh
a
vior
commit
|
commitdiff
|
tree
2019-05-29
l
g
oubet
Enable users
t
o
m
erge all conflicts at once through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgo
u
bet
Merging single-valued c
o
n
t
ainment changes can lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prevent LCS computat
i
on when we do not need
or
d
ering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prevent d
u
p
l
icat
e
ins
e
rtion points to
b
e show
n
in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoubet
Prevent CMV d
i
sposal when user
s
elects mult
i
pl
e
elements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgo
u
bet
Only add new adapters when ne
e
d
e
d
commit
|
commitdiff
|
tree
2019-04-14
l
goubet
Iterate over the diff
e
rences inste
a
d
o
f the
m
atches
commit
|
commitdiff
|
tree
2019-04-09
lgou
b
et
Prevent OutOfMemory
E
rrors fro
m
t
h
e UI when switching CM
V
commit
|
commitdiff
|
tree
2019-04-08
l
goubet
Perform
a
nce -
Comp
u
t
i
ng req
u
i
rements times
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
T
he UML tests shouldn't use a cached
i
nstance of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
l
g
oubet
Restore possibil
i
ty to rem
o
ve mergers from the regi
s
try
commit
|
commitdiff
|
tree
2019-04-01
William Piers
Fixed Ar
r
ayOutOfBounds in case of empty l
i
sts
commit
|
commitdiff
|
tree
2019-03-22
l
g
oubet
Make s
u
re we
hook t
h
e UI wh
e
n
users pr
o
v
ide a
p
r
ecomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
B
ump EMF C
o
mpare
t
o
3
.
3
.
7 i
n
pr
e
p
arati
o
n
for 2019-0
6
commit
|
commitdiff
|
tree
2019-03-21
l
g
oubet
Dispo
s
i
n
g of the comparison sho
u
l
d
n't be
d
o
n
e by the SM
V
commit
|
commitdiff
|
tree
2019-03-04
lgoubet
A
v
oid Class
C
astException when me
r
g
ing fea
t
ure map changes
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump versio
n
s for 3
.
3
.
6 for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
patch Mode
l
GitMergeEditorI
n
put for EGit 5
.
3
.
0
compat
i
bility
commit
|
commitdiff
|
tree
2019-02-26
lgo
u
bet
Su
p
pres
s
guava nes
t
e
d concat
e
nations
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove accide
n
tal use of Guava
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
S
WTException wh
e
n swi
t
c
hing comparison
s
in a c
o
mpare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgo
u
be
t
Allow clients t
o
provide p
r
e-computed comparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
Philip Langer
[527567] Provide suppo
r
t for a general property mer
g
e
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
P
hilip Langer
[514079
]
Improve mirrori
n
g support
commit
|
commitdiff
|
tree
2018-12-04
lgou
b
et
Igno
r
e
f
ailing git test
s
for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bum
p
v
ersion
s
to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use
a
r
eleased version of Siriu
s
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[5417
3
0] Reverts d59c
9
24 due to an UI freeze
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump feature versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump version
s
commit
|
commitdiff
|
tree
2018-06-22
Stéph
a
ne Thibaudeau
Ex
t
e
n
s
i
o
n
p
oint
t
o pr
o
vide specific matching rules
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
Stéph
a
ne Thi
b
audeau
Remove useless and mysterious code
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thibaude
a
u
EMF Compare i
s
compatible with
J
G
i
t 5
.
* ver
s
ions
commit
|
commitdiff
|
tree
2018-06-22
Stéphane
Th
i
baude
a
u
Add expli
c
it dependency to or
g
.
eclipse
.
gef
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thi
b
a
u
deau
D
o
not minimize identi
c
al
reso
u
rces when Xtext is
u
sed
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thibaudeau
Use white-list strategy to re
t
rieve the
M
odel prov
i
d
e
r
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Th
i
b
a
udeau
Better
handlin
g
of Xt
e
xt with Live scop
e
optio
n
commit
|
commitdiff
|
tree
2018-06-22
l
g
oubet
EMF
Compare is no longer
compa
t
ibl
e
with egit
<
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgou
b
et
I
n
troduce t
e
st fo
r
merg
e
s with multiple ance
s
t
o
rs
commit
|
commitdiff
|
tree
2018-06-04
A
rthur Dauss
y
[
5
34365] Fix RecursiveModelMerger
for
"
binary"
git
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arthur Daussy
Do
not
h
an
d
le "
m
erged" f
i
le
s
twice when JGit stages
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
A
r
thur Daussy
[5
3
52
0
0] Creat
e
a
n
ew TreeWalk instead reus
i
ng on
e
commit
|
commitdiff
|
tree
2018-05-03
Phil
i
p Langer
Improve performance of Diff
U
t
i
l
commit
|
commitdiff
|
tree
2018-05-03
P
hilip Langer
Im
p
rove performance of ComparisionUt
i
l
commit
|
commitdiff
|
tree
2018-05-03
P
hilip
Lange
r
Impro
v
e perf
o
rmance of eq
u
ality help
e
r
commit
|
commitdiff
|
tree
2018-05-01
C
h
ristian
W
.
D
a
mus
[525473] [
P
ap
y
rus] Connections disappear
whe
n
comp
a
ring
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Ph
i
lip La
n
ger
Avoid
v
i
s
iting eleme
n
ts multiple times
i
n Graph
.
ParentsIterato
r
commit
|
commitdiff
|
tree
2018-05-01
C
hristi
a
n W
.
D
amus
[525286
]
[Papyrus] D
i
f
f
s in invisi
b
l
e
stereot
y
pe pro
p
e
r
ty
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
[521940] Prevent
index out of bou
n
d
s
exception on emp
t
y
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip
L
a
nge
r
SWTU
t
i
l
.
s
a
feRedra
w
sh
o
uld che
c
k for dispos
e
d
c
o
ntrol
commit
|
commitdiff
|
tree
2018-05-01
Phil
i
p
L
anger
[527567] Generalize the table
a
n
d tree
m
erge viewer
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Camille Letavernier
[529882] Synchronize z
o
om levels and a
l
low changing
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
hilip Langer
Improve performance o
f
t
he mergi
n
g process
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
Impr
o
ve
p
erforman
c
e of I
D
iffRelationshipCo
m
puter imp
l
ementat
i
ons
commit
|
commitdiff
|
tree
2018-05-01
P
hi
l
ip
L
anger
Improve performance of Abs
t
r
ac
t
C
opyCommand
.
getChangedDiffs
commit
|
commitdiff
|
tree
2018-05-01
Philip Lange
r
[527864] Prevent
CMV lines to be broken af
t
er mer
g
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Lan
g
e
r
[
5
2
7
858] Select
i
ng a diff
w
ith con
f
licts fails
commit
|
commitdiff
|
tree
2018-05-01
Ph
i
lip Lang
e
r
[527
5
67] DiagramComp
a
reIte
m
P
roviderAdapterF
a
ctory sho
u
ld
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
h
ilip Lan
g
er
[508526]
Improve tex
t
compare
commit
|
commitdiff
|
tree
2018-05-01
Phil
i
p Langer
Th
e
show merg
e
consequences co
n
tro
l
is confusing when
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
h
ilip L
a
nger
EMFCompareStructureMergeViewer does much redu
n
dant
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phili
p
La
n
ger
Supp
o
rt key bindi
n
gs
for comm
o
nly
used merge/navigate
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phili
p
Lan
g
e
r
Im
p
rove ManyStructuralFeature
A
c
c
essorImp
l
.
getDi
f
fWi
t
h
V
alue
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phili
p
Langer
Im
p
ro
v
e IMe
r
ger registry i
m
p
l
ementatio
n
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip Lan
g
e
r
Improve pe
r
f
ormance
o
f textual val
u
e
m
a
t
ching
commit
|
commitdiff
|
tree
2018-04-30
Ph
i
lip Lang
e
r
Improve performance of Compar
i
s
o
nSpec
commit
|
commitdiff
|
tree
2018-04-30
Philip
L
anger
Avoid expensive notifications process
i
ng after compare
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
P
hilip Lan
g
er
Dec
r
ease progress
monitoring overhe
a
d
commit
|
commitdiff
|
tree
2018-04-30
Philip L
a
nger
AbstractStructuralFe
a
tur
e
Ac
c
e
ssor
.
com
p
u
t
eDifferences
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
Phil
i
p
Lang
e
r
Cache StructureMergeVi
e
werFilter
r
esu
l
ts
commit
|
commitdiff
|
tree
2018-04-25
Philip Lange
r
[522422] Label-based
c
o
ntent viewer sh
o
uld clean up
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
Phi
l
ip L
a
nger
[
521948]
S
upp
o
rt changi
n
g t
h
e state of
d
i
ffs al
r
eady
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
P
h
i
lip L
a
nger
[516248] I
m
p
r
ove Naviga
t
able caching
commit
|
commitdiff
|
tree
2018-04-19
M
a
rt
i
n Fle
c
k
[516248] Actions for previous/ne
x
t un
r
esolve
d
change
commit
|
commitdiff
|
tree
2018-03-19
Laurent Goubet
Proxy loading f
r
om
the
m
erge tool
commit
|
commitdiff
|
tree
2018-03-16
Laurent Go
u
bet
A
l
low proxy resoluti
o
n from
the
E
M
F Compare cont
e
nt
.
.
.
commit
|
commitdiff
|
tree
next