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
2018-06-04
Arthur Daussy
[534365] Fix
R
e
cursiveModelMe
r
ger for
"
binary" g
i
t
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arthur Daussy
Do no
t
h
and
l
e "
m
erged" files twic
e
when JGit stages
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Ar
t
hur Daussy
[535200
]
Create
a
new TreeWal
k
instead
r
eusing one
commit
|
commitdiff
|
tree
2018-04-12
Art
h
ur Daus
s
y
Icon fo
l
d
er should
be included in the
b
u
i
ld
(
E
gi
t
.
ui)
commit
|
commitdiff
|
tree
2018-04-12
Arthu
r
Daussy
[5
3
3486] Improve content type handling by EMF C
o
mpar
e
commit
|
commitdiff
|
tree
2018-04-11
Arthur Daussy
[5
3
3467] Fixe
s
"
r
e
q
uire"
l
inking process in Si
r
iusDiffP
o
stPr
.
.
.
commit
|
commitdiff
|
tree
2018-01-24
Arthur
Daussy
[530250] Fix Recur
s
iveM
o
delMerge
r
t
o
be able
to handle
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2018-01-05
A
r
t
h
ur Daussy
[5
2
9438] Manually disp
o
se
DropDownMergeMenuAct
i
on when
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2017-12-26
Arthur Daussy
[529212] Disp
o
s
e EMF
C
ompar
e
Color
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
Arthur Daussy
Adds u
n
it
t
est for
enum
commit
|
commitdiff
|
tree
2014-12-16
Art
h
u
r
Daus
s
y
Adds new no
d
e
typ
e
s
in the "Nodes" metamodel to test
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Arthur Daussy
M
e
rge "[EMF Compare CLI] Ad
d
g
it logi
c
alpull
section
.
.
.
commit
|
commitdiff
|
tree
2014-12-03
A
rt
h
ur Da
u
ss
y
[E
M
F Comp
a
r
e
CLI] Documentation of
th
e
'logicalrebase
.
.
.
commit
|
commitdiff
|
tree
2014-12-01
Arthur Daussy
C
orrec
t
s
an
e
r
r
or
i
n the '
l
o
g
ical
c
herry-pick'documentati
o
n
.
commit
|
commitdiff
|
tree
2014-12-01
A
rthu
r
Dau
s
sy
[EMF Compage CLI] Adds a "Know
n
issues" section
.
commit
|
commitdiff
|
tree
2014-12-01
Arthur Dauss
y
[EMF
C
omp
a
re CLI] Documentation of the 'logical
c
herr
y
.
.
.
commit
|
commitdiff
|
tree
2014-11-05
Arthur Daussy
UI
test
s
:
U
pdate differences order
commit
|
commitdiff
|
tree
2014-11-05
Arthur Daussy
UI t
e
s
ts: Updat
e
e
d
itor label after
m
o
difi
c
ation
i
n
.
.
.
commit
|
commitdiff
|
tree
2014-11-03
Arthur
D
aussy
Co
n
figures Q7 tests to run
o
n M
a
r
s
platform
commit
|
commitdiff
|
tree
2014-10-23
Arthur Daussy
Fixe
s
org
.
eclipse
.
emf
.
compar
e
.
diagra
m
.
ide
.
ui
.
papyrus
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
t
hur
Daus
s
y
Unloads UML resour
c
es than
k
s to the re
s
ource set hooks
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Da
u
s
s
y
Prevents
scope to filt
e
r re
s
ources u
s
ing pat
h
ma
p
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Da
u
s
s
y
Adds
onDispose me
t
hod on the r
e
sou
r
c
e
set hook
s
.
commit
|
commitdiff
|
tree
2014-10-14
Arth
u
r
D
a
ussy
Corr
e
cts labels aft
e
r
e
n
hanc
e
m
e
nt
o
n conflicts l
a
b
e
l
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daussy
[39
8
367] Adds Papyrus CSS c
u
stom
i
za
t
ion s
u
ppor
t
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur
D
aussy
Adds ResourceSe
t
Hook extension point
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
thur Dau
s
sy
Prevents loading
twice th
e
same model in a No
t
LoadingResourc
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-13
Ar
t
hur Daussy
[443
3
37] Prev
e
nt
large
shapes icons
f
or
stereot
y
pe
s
.
commit
|
commitdiff
|
tree
2014-10-13
Art
h
ur Daus
s
y
[
4
46413] StructureMergeVi
e
wer sho
u
ld rebuild its tr
e
e
.
.
.
commit
|
commitdiff
|
tree
2014-10-09
Arthur Dau
s
sy
U
pdates Q7 tes
t
s
c
onfiguration
.
commit
|
commitdiff
|
tree
2014-10-09
A
r
thur Daussy
Cor
r
ects G
i
t label
commit
|
commitdiff
|
tree
2014-10-08
Arthur Daussy
Corrects typo on logical
m
odel minimizer
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-08
A
r
thur Daussy
Adds
t
ests
to load
U
ML pro
f
i
le in
N
o
tLoadingResourceSet
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-08
Arthur
Daussy
[444978] Prevents duplicated
I
S
t
or
a
ge wh
e
n creating
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-29
Ar
t
hur Daussy
EGit b
e
havior change
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
Art
h
ur Daussy
[
443420] Handle
not integrate
d
dynamic
p
rofile
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
Arth
u
r Daussy
[441089] Nagivation between differences
now uses an
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
A
rthur Dauss
y
[
4
4
3
330] Lo
a
d
U
M
L s
t
atic pro
f
ile using pat
h
map
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
Arthur Da
u
s
sy
[443330] Av
o
id get
t
ing a "Profile version
change" er
r
o
r
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
Arthur Daussy
[443330] I
m
prove
s
URI
h
an
d
ling
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-27
Arthur
D
aussy
[442355] Corre
c
t
s
label on "ReplaceWith" dialog
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-25
Arthur Daussy
U
pdates editor labels due to EGit behavior change
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-22
A
r
t
hur
D
a
ussy
Upda
t
e
s pre
f
erences UI tests
to ada
p
t to
n
ew
content
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-22
Arthur Da
u
ss
y
Corrects renaming
problem
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-21
Art
h
ur
D
aus
s
y
UI improvemen
t
:
Corr
e
ction
of an err
o
r on
th
e
remov
a
l
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-19
Arthur
D
a
ussy
U
I
improv
e
ment: Prevents fr
e
ezing U
I
d
u
ring groups
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-19
Arthur Dauss
y
I
t
e
m providers pre
f
er
e
n
ce page documentation
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-19
Ar
t
hur Daussy
[4
3
4621] Correction o
n
R
ootIDMatch
i
ng s
t
r
a
t
e
g
y
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-14
Art
h
ur Daussy
[441437] Corrects
a
n e
r
ror in the
d
evelo
p
per guide
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-01
Arthur Daussy
Corrects possible NPE on resource re
s
o
l
ving
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-18
Arthur D
a
ussy
Updates
extern
a
l
adapter factorie
s
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-18
Arthur
Da
u
ssy
Adds Item prov
i
de
r
preference page
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-18
Arthur Dau
s
sy
Tutorial part 2
:
Git
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-17
Arthur Daussy
Filt
e
rs EMF compa
r
e adapter
factories using pref
e
r
e
nce
s
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
A
r
thur Daussy
Corre
c
tion of 2 check
s
tyl
e
errors
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Art
h
u
r
D
a
ussy
C
orrection o
f
unit t
e
st
s
for
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur Daussy
U
se
s
tat
e
ful
item
p
r
oviders for Diag
r
am exte
n
si
o
ns
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur D
a
uss
y
Regenates
.
edit code
f
or DiagramCompare
metamo
d
el wi
t
h
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Ar
t
hur Dauss
y
Test
i
nteg
r
ation of profiles in EMF Compare
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Ar
t
hur Daussy
Custo
m
izes
the way
S
t
e
reotypeAttribute
C
hange and Stereoty
p
eR
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arth
u
r Daussy
Use
stat
e
ful item providers for
U
M
L
exte
n
si
o
ns
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur
D
au
s
sy
Unit tests
f
or Dec
o
ratorUMLP
r
o
file
I
temProvider
A
dapterFactory
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur D
a
ussy
Adds custom ste
r
e
otypes ico
n
s
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur
D
aussy
Cutomization of t
h
e way st
e
r
eotyped eleme
n
t
s are displayed
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-26
Arthur Dau
s
sy
Stereotyped
E
lemen
t
C
h
a
n
gePostProcessor
u
nit tests
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-26
Arth
u
r D
a
ussy
Regener
a
tes EMF Compare static
t
est profile
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-26
Arthur Daus
s
y
A
dd
s
U
M
LStereot
y
ped
E
lementChang
e
post processor
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-23
A
r
thur Daussy
Add Ster
e
otype
d
elem
e
nt change t
o
t
h
e U
M
L Com
p
are
m
eta
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Arth
u
r Daussy
Gene
r
ates
UM
L
Com
p
are
source code
with E
M
F
2
.
10
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Arth
u
r
D
a
u
ssy
Unit test for MDT Papyrus
d
iffere
n
c
e
s order
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Ar
t
hur
Daus
s
y
EMF Compare tuto
r
ia
l
: Tu
t
or
i
a
l
part 1
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
A
rthur Daussy
EMF
Compa
r
e
tutor
i
al: EXTlibrary plugins
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-16
Arth
u
r Daussy
A
v
o
i
d unnec
e
ssa
r
y dialog when commitin
g
non
fragmented
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-11
Arthur Daus
s
y
Correct th
e
order
o
f processing post processors
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-06
Arthur
Daussy
[
4
35612] P
r
even
t
s memory
b
etween selectio
n
in TreeM
e
rgeViewer
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-04
A
r
thur D
a
ussy
Corre
c
ti
o
n
o
n UMLDif
f
er
e
ncesOrd
e
r
T
e
st
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-04
A
r
thur Daussy
UML diff
e
ren
c
e
s ord
e
r test
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Arthur Da
u
s
s
y
[434828] Test
M
erge
C
onflict Di
f
f With Conflicting
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Ar
t
h
ur
D
auss
y
[434822] Conflict bet
w
een move
a
nd
d
elete
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
Arthur Daussy
Use width hint in preference pages
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
Arthur
Daussy
[4
3
2033] Do not
r
eset Gro
u
p and filter after saving
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-23
Arthur Daussy
[
43536
5
] Cascadi
n
gFilter sh
o
uld
n
'
t
filter o
u
t chang
e
s
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-20
Arth
u
r
Daussy
[434827] Wrong
o
verlay icon after
merge
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-13
Arthur Dauss
y
[
4
3
4714] Add EMF Conten
t
type to model provider
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthu
r
Daussy
Add des
c
ripti
o
n for "
U
M
L refi
n
ed ele
m
ent"
f
ilter
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Art
h
ur Daussy
Add a d
e
scri
p
ti
o
n to "Diagram Refined
e
lements"
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthur D
a
ussy
Ad
d
des
c
rip
t
ion and label to
"
Diagram post p
r
ocessor"
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthur Dau
s
sy
E
n
gines preference page: Correct message dialog
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
G
r
o
ups and Filt
e
r
s preference pa
g
e: Li
n
es up labe
l
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
Arthur Dau
s
sy
[429636
]
Documentatio
n
upd
a
te
:
Groups
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
A
rthur Daussy
[430
3
72] Documentation update
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
Art
h
u
r
Daussy
I
mpr
o
ves
EMF Compare glo
b
a
l preference
p
a
ge
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-08
Arthur
Daussy
[430
6
82]
New t
e
st:
T
est ModelResol
v
er
M
anager
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-08
Arthur
D
aussy
[
4
30682
]
User D
o
c: Model resolution
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-07
Arthur Daussy
Impr
o
ves
p
reference page UI
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-07
Ar
t
h
u
r Daussy
[430682] Improves
M
o
delResolverManag
e
r
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
Correct Helios compati
b
ilty
b
reak
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
A
r
t
hur
D
aussy
[
429441] User doc
up
d
at
e
:
Post processors configuratio
n
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
[431
7
85] Correct synchroniza
t
io
n
mec
h
a
n
ism
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daus
s
y
[427126] User doc u
p
date:
E
ngine co
n
figuration
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
next