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
[492190] Stereotypes not displayed in SMV for SYSML elements
2016-05-18
Alexand
r
a Buzila
[4
9
2190]
S
t
e
r
eotypes not displaye
d
in
SMV for SYSML
.
.
.
commit
|
commitdiff
|
tree
2016-05-12
Laur
e
n
t Delaigue
Fix checkstyle
on RAC
C
onflic
t
S
earch
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-05-10
Mathieu Cartaud
[49
2
261] Merg
e
R
esource
A
ttChange in the right resour
c
e
commit
|
commitdiff
|
tree
2016-05-09
L
a
urent
D
elaigue
[
493255] Fix sc
a
lable conflict dete
c
tor
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-05-09
Si
m
on D
e
lisle
[488089] Fix
random pos
i
t
i
on of diagr
a
m
s after me
r
ge
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-04-21
Philip Langer
[4887
0
0] Cha
n
ge la
b
el to Conflict [X o
u
t
o
f Y differe
n
ces
.
.
.
commit
|
commitdiff
|
tree
2016-03-25
Laurent Delai
g
ue
[490
4
30]
F
i
x S
t
ack
O
v
e
r
fl
o
wError
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-29
Laurent De
l
a
i
gue
F
i
x target platform for mars
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-26
La
u
rent Delaigue
[488549] Fix disposed widget in
P
r
oblemIndicationComposit
e
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-26
Laurent Delaig
u
e
[467547] Fix IllegalArgumentEx
c
e
p
tion in Compa
r
eToolBar
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-26
Laure
n
t Delaigue
Fix NPEs bec
a
use comp
.
getMatch can return nu
l
l
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-26
Mathieu Cartaud
[4875
6
1] Fi
x
issu
e
on resource att
a
chment move confli
c
t
.
.
.
commit
|
commitdiff
|
tree
2016-02-12
P
h
ilip Langer
[479449] Add specification for
m
ultiplici
t
y change
commit
|
commitdiff
|
tree
2016-02-12
P
h
il
i
p La
n
ger
[
4
85494] Add specificatio
n
of d
i
-file change ignore
.
.
.
commit
|
commitdiff
|
tree
2016-02-02
L
a
u
r
ent
D
elaigu
e
[485513] Fix NPE in NameMatchingStrategy
.
f
i
ndMatch
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-01
Mathieu Cartaud
Impr
o
ve pr
o
gres
s
mo
n
itor to allow
c
ancellin
g
commit
|
commitdiff
|
tree
2016-01-27
Stefan
Di
r
ix
[
4
74723] Introd
u
ce
IEMFComparisonSource to sup
p
o
rt
.
.
.
commit
|
commitdiff
|
tree
2016-01-20
Laurent Dela
i
gue
[4850
2
0] Fix EditionDist
a
nce weight p
r
ovi
d
er
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-20
Laurent Delaigu
e
Fix N
P
E in ThreeWay
C
o
m
p
arisonGroupPr
o
vider
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-20
Lauren
t
Dela
i
gue
[
4
85512] Fix N
P
E i
n
ResourceDe
p
e
ndencyPr
o
vider
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-19
Philip Langer
[485
4
94] Add mis
s
ing j
a
va-doc to IgnoreDiFilePostPr
o
cessor
commit
|
commitdiff
|
tree
2016-01-19
La
u
re
n
t Delaigue
I
m
prov
e
logs
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-15
Alexandra
Buzila
[
4
84557]
Re
s
o
u
rceAttachment vs
Attribute conflicts
commit
|
commitdiff
|
tree
2016-01-11
Lauren
t
Delaigue
[483892
]
Take match en
g
ine r
e
gi
s
try into a
c
count
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-08
Laurent D
e
la
i
gue
Improve
lo
g
ging
d
uring comparison
f
or conflicts
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-06
L
a
urent Delaigue
Make required difference
s
o
rder
d
etermin
i
stic
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-05
L
a
urent
Delaigue
Fix signature
o
f
p
redicate
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-05
Laurent Delaig
u
e
NPE in R
e
sourceAttachmentCh
a
n
geTooltip
P
rovide
r
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-05
Laurent Delaigue
[
4
84557] ResourceAttachme
n
t vs Attribute c
o
n
f
lict
s
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-05
Laurent Delaigue
[484576
]
F
ix bug on pseudo-conflict compu
t
ation
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-05
L
au
r
ent Dela
i
gue
[484577] Make
sure 'r
e
quires'
a
re on t
h
e same s
i
de
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-05
L
a
uren
t
Delaigue
Remove dangerous
&
useless Post-Processor
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-12-17
L
aure
n
t De
l
aigue
[
4
845
4
3] NPE in EMFCompareContentM
e
rgeViewer
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-12-17
Laurent Delaigue
[4
8
454
2
] NPE in ReferenceCh
a
ngeTooltipProvider
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-12-11
Laurent Del
a
i
gue
Fix p
e
rformance tests, aga
i
n
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-12-11
L
a
ure
n
t Delaigue
F
i
x pe
r
formance tests
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-12-10
La
u
rent Delaigue
Fix warnings in Mode
l
GitMergeEditorInpu
t
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-12-09
L
a
urent
Dela
i
gue
Fix more RCPTT tests
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-12-08
Lau
r
ent Dela
i
gue
Fix bug in "Re
p
lace with Local History"
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-12-04
Axel Richard
Mak
e
document
a
tio
n
less ambig
u
ou
s
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-12-03
Laurent Goubet
[480388] Av
o
id re
c
ur
s
ion whe
n
lo
a
d
i
ng packages or p
r
ofiles
.
commit
|
commitdiff
|
tree
2015-12-03
Laurent Goubet
[4803
9
5] Avoid calling
E
coreUt
i
l
.
getURI()
a
s
much
as
.
.
.
commit
|
commitdiff
|
tree
2015-10-26
Laurent Delaig
u
e
[473
9
97] wro
n
g log
i
cal
m
ode
l
proxy
r
esol
u
tion
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-23
P
h
ilip Lan
g
er
[476295] Add tes
t
cases
commit
|
commitdiff
|
tree
2015-10-23
Philip La
n
ger
Add additiona
l
test case with unrelated fi
l
e that is
.
.
.
commit
|
commitdiff
|
tree
2015-10-23
P
hilip Langer
[475890] A
d
d
A
bs
t
ractG
i
tM
e
rgeTestCase and te
s
t case
.
.
.
commit
|
commitdiff
|
tree
2015-10-23
Ph
i
li
p
Langer
Add mea
n
s to also stage del
e
ted files before
committing
commit
|
commitdiff
|
tree
2015-10-22
Ax
e
l Richard
[4785
3
9
] Refining conflicted diff
d
oesn't s
h
o
w s
u
b
.
.
.
commit
|
commitdiff
|
tree
2015-09-18
Laurent De
l
aigue
Remove dependenc
y
to rcp
i
n
e
m
f
.
compare
.
tests
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-18
Laurent Del
a
igue
[
4
7
7
607] Fix er
r
oneo
u
s conf
l
ict detection on uncontrol
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-18
L
a
urent Delai
g
ue
F
ix N
P
E in EMFRes
o
urceM
a
ppingMerg
e
r
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-10
Laurent Delaigue
[464
3
79
]
I
nvert res
o
urce
m
atc
h
ing str
a
tegies
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-07
Laurent
Del
a
igue
R
e
vert "I
m
plementatio
n
of con
t
extual too
l
tips"
commit
|
commitdiff
|
tree
2015-07-07
Laur
e
n
t
D
elaigue
[471010] Fix l
o
g
4
j conf
i
g ma
n
agem
e
nt
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-06-26
Laurent Delaigue
Improve robu
s
tness of Res
o
urceComputationSc
h
edulerTest
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-06-23
Laurent Delaigue
Simplify code in
R
esou
r
ceDependencyLocalRe
s
olver
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-06-22
La
u
r
e
nt Delaigue
Fix
N
PE in E
M
FModelProvider
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-06-22
L
a
urent
Delaigue
Happy boy-scout:
remove unused import
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-06-22
Laurent Go
u
b
et
C
ac
h
ing - Don't minimiz
e
the logical m
o
d
el eage
r
ly
commit
|
commitdiff
|
tree
2015-06-22
Laur
e
n
t Del
a
i
gue
C
ompa
r
isonU
t
il
.
g
e
tCom
p
a
r
ison(diff) wh
e
re needed
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-06-15
Phi
l
ip
L
a
n
ger
F
i
x
m
inor typo i
n
javadoc
commit
|
commitdiff
|
tree
2015-06-15
Axel
Ric
h
a
r
d
[
4
58961] Fix Coordinates change contains di
f
fs from
.
.
.
commit
|
commitdiff
|
tree
2015-06-10
Axel Richard
[4
5
9
13
1
] Fix Re
-
c
onnec
t
c
h
anged resources &
r
andom
.
.
.
commit
|
commitdiff
|
tree
2015-06-10
A
x
e
l Richard
Bump fea
t
ure versions to 3
.
2
.
0 on master
commit
|
commitdiff
|
tree
2015-06-01
M
ichael Bor
k
ows
k
i
[4676
7
7
] Detection of
binary
i
dentical resources
Also-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-06-01
Axel Richar
d
[
468740] Fix
By
S
ide Group Provider
:
Left Side Gr
o
up
.
.
.
commit
|
commitdiff
|
tree
2015-05-28
Laurent Dela
i
g
ue
[462842] Edge r
e
connect with UML
.
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-28
Ax
e
l R
i
chard
Fix typos in cor
e
sdk & egit sdk feature names
commit
|
commitdiff
|
tree
2015-05-27
Axel Ric
h
a
rd
[4676
8
4] Fix CompareT
o
olbar is grayed
o
ut
a
f
ter
sa
v
ing
commit
|
commitdiff
|
tree
2015-05-27
A
x
e
l R
i
c
h
a
r
d
[468267] Fix NPE in EMFCo
m
pareDif
f
TreeRule
r
#findFirstA
n
cesto
.
.
.
commit
|
commitdiff
|
tree
2015-05-18
L
a
uren
t
Delaigue
[46293
8
] Preve
n
t
infinit
e
l
o
op during merge
.
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-13
L
aurent Delaig
u
e
Added f
i
nal to class variabl
e
s
.
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-13
L
aur
e
nt Delaigue
Added logs
.
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-05
Axel Ric
h
ard
[463785] Resourc
e
LocationChange: UI c
h
anges
commit
|
commitdiff
|
tree
2015-05-05
Axe
l
R
i
c
hard
[
46
3
785]
R
esourceLoca
t
ionChan
g
e:
core
c
hanges
.
Also-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-04-29
Stefan
Dirix
[461697] Add Save
P
arameter Hook for
P
apyrus model
files
commit
|
commitdiff
|
tree
2015-04-29
Laurent Delaigue
[4
6
0773] Regist
e
r m
o
d
e
l reso
l
ver
o
n
model file extensions
.
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-04-28
Ste
f
an Dirix
[
46
0
780] Add LoadOnDemand-Policy for UML2 metamodel
.
commit
|
commitdiff
|
tree
2015-04-28
Stefan Dirix
[464904] E
n
sure NotLoadingResourc
e
Set looks
a
t al
l
.
.
.
commit
|
commitdiff
|
tree
2015-04-27
Axe
l
Ri
c
h
a
rd
[463785
]
Add new co
n
cept in EMF Compare: Resou
r
ceLocati
o
nChange
commit
|
commitdiff
|
tree
2015-04-17
Phi
l
i
p
L
anger
[
464691
]
F
i
xes typo in mes
s
age
key of
a
ncestor si
d
e
commit
|
commitdiff
|
tree
2015-04-15
Laur
e
n
t
Goubet
Do not remove read-onl
y
storages f
r
o
m
com
p
arison scope
commit
|
commitdiff
|
tree
2015-04-14
Stefan Dirix
A
d
d
Util Class to read Model Exte
n
si
o
n Poi
n
t of Papy
r
u
s
.
commit
|
commitdiff
|
tree
2015-04-14
Ax
e
l Rich
a
rd
[464379] Matching resources
s
h
o
uld u
s
e id strategy
.
.
.
commit
|
commitdiff
|
tree
2015-04-10
L
aurent Delaigue
Upda
t
ed tar
g
e
t platfor
m
s de
f
initions
.
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-04-01
Axel Richard
[442265][460782] A
v
oid In
f
inite "plea
s
e wait"
view
e
r
.
commit
|
commitdiff
|
tree
2015-03-24
Axe
l
Ri
c
hard
[461986] [
U
I] Tests - Intermediat
e
Proxies Re
s
oluti
o
n
commit
|
commitdiff
|
tree
2015-03-24
A
xe
l
Rich
a
rd
[461986]
Fix
b
ug
in Intermedi
a
te Proxies
Resoluti
o
n
commit
|
commitdiff
|
tree
2015-03-24
Laurent Goube
t
[460317] S
h
ouldn't
use
=
= to compare URIs
.
commit
|
commitdiff
|
tree
2015-03-20
Laurent Del
a
igue
Fix bug of cr
e
a
t
i
n
g equivalence wit
h
only
o
ne diff
.
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-03-13
Lau
r
e
n
t
Delaigue
[462072] Fixes ClassCastExce
p
t
ion
on EAt
t
ribu
t
e Feature
.
.
.
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-03-13
Axel
R
ichard
[4422
2
7] Compare an untr
a
cked file with HEAD
.
commit
|
commitdiff
|
tree
2015-02-06
L
a
ure
n
t
Delaigu
e
[457
0
3
4
] Proximi
t
y
E
Obje
c
tM
a
tcher sh
o
uld su
p
port
c
ancellation
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-02-02
Laur
e
nt D
e
l
a
i
gue
[458544] I
m
possible
t
o
s
a
ve value of tex
t
att if left
.
.
.
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-21
L
aurent Delaigue
H
a
p
p
y boy-sc
o
ut
:
F
ix
e
d findbu
g
s warning
.
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-25
Laurent Delaigue
Impro
v
ed d
e
ve
l
oper guide
a
nd fixed typos
.
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-25
Laurent Delaigue
Fixed
some s
p
ellin
g
mistakes and tried to improve
r
eada
b
ility
.
Signed-off-by: Laurent Delaigue <
laurent.delaigue@obeo.fr
>
commit
|
commitdiff
|
tree