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
[492341] Res Att Change correctly implies diffs
2016-04-27
Mathieu Cart
a
ud
[492341] Res Att Change correctly
impli
e
s diff
s
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-29
Mathi
e
u
C
ar
t
aud
Fix git related
t
e
sts
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-26
M
a
thi
e
u Car
t
aud
[487561]
F
ix issue on resource
a
ttachme
n
t move con
f
lict
.
.
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-25
Mathieu Cartaud
F
ix err
o
r
i
n Git tests setup
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-23
Mathieu Cartaud
[487306] U
s
e only relevan
t
diagnostic to compute
t
r
aversals
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-19
M
athieu Cartaud
[48
7
561
]
Fix
m
issing conflict
o
n resource
u
ncontrol
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-19
Mathieu Cartaud
Fix er
r
or in th
e
s
etup
o
f
EGit
related tests
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-19
Mat
h
ieu Cartaud
Add Google GSON
in
target p
l
atform (required
by JGit)
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-09
Mathieu Cartau
d
Re
m
ove usele
s
s
m
ethod in Resour
c
eAttachmentChangeConflictSearch
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-09
Math
i
eu Cart
a
ud
Reactiva
t
e
org
.
ecli
p
se
.
e
m
f
.
compare
.
t
ests
t
est suit
e
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-03
Ma
t
hieu
C
artaud
[4870
1
1] Fi
x
wrong c
o
nflict d
e
tection
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-01
Mathieu Cartau
d
Improve
progress
m
oni
t
or t
o
a
l
low cancelling
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-01
Ma
t
h
i
e
u
C
a
rtaud
Sc
a
lable conflic
t
d
etector
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-27
Ma
t
hieu Ca
r
taud
Add
m
i
ssing
t
est suit
e
f
o
r
N
eon
b
uild
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-26
Mathieu Cartaud
[485266] Fix m
e
rge
c
onseque
n
ces
f
or delete
/
move
c
onflicts
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-22
Mathi
e
u
C
a
rtaud
Use JGit provided p
r
og
r
ess monitor
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-20
Mathieu
Cart
a
ud
[48609
3
]
D
on't create log f
i
le
i
f logs are off
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-13
Mathieu Cartaud
[485538] Fi
x
Cl
a
ssC
a
stE
x
ception in
M
e
rgeReso
l
utionManager
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-08
Mat
h
ieu Cartaud
[484579] Fix m
e
rge consequence
s
alg
o
r
i
t
hm
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-08
M
a
thieu
C
ar
t
aud
Add d
e
bug
logging fo
r
me
r
ge ac
t
ions
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-06
M
a
thieu Cartaud
Fix RCPTT b
u
gs
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-11-04
Mathieu
Cartaud
[475935] Fix poten
t
ial
I
lleg
a
lSt
a
t
eException in MergeViewe
r
Item
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-27
Ma
t
hieu C
a
rta
u
d
[473190] Fix NPE i
n
the Com
p
a
reStr
u
ctureMergeViewer
.
.
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-20
Ma
t
hieu Cartaud
[U
I
t
ests] Fix
p
apyr
u
s RCPTT tests
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-20
Mat
h
ieu Cartaud
[UI tests] Fix papyrus RCPTT t
e
s
ts
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-19
M
athie
u
Cartaud
[UI tests]
A
d
d
tests involving Papyrus
&
Egi
t
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-15
Mathieu Cartaud
Extract EMFCompareCon
f
iguration fro
m
E
MFCom
p
ar
e
RCPUIPlugin
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-13
Mathieu Cartaud
[4777
6
9] Papyr
u
s linked
R
e
sou
r
ceAttachme
n
tC
h
a
nges
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-12
Mathi
e
u Cart
a
ud
Fix bugs caused
b
y an EGi
t
up
d
ate
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-01
Ma
t
hieu Cartaud
I
m
plem
e
ntation o
f
c
o
n
textual tooltips
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-01
Ma
t
hieu Car
t
aud
[4
7
8
0
32
]
Fix
accept/rejec
t
dro
p
down ico
n
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-30
Mathieu Cartaud
[464386] Add comm
i
t short id to mak
e
label mor
e
di
s
tingui
s
hi
.
.
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-23
M
a
thi
e
u Carta
u
d
Model Merge Too
l
+ classes
to do model me
r
ges
with
.
.
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-15
Mathieu Cartaud
Fix
l
abel issues when
u
sing the
M
ergeTool on merge
.
.
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-03
Mat
h
ieu Ca
r
t
a
ud
Implementat
i
on of contex
t
u
al tooltips
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-03
Mathieu C
a
rtaud
[47319
0
] Fix NPE in the CompareS
t
ru
c
t
u
reMergeV
i
ewe
r
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-02
Mat
h
ieu
C
arta
u
d
Add a prop
o
sal f
o
r the modificati
o
n of Compare UI t
o
oltip
s
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-02
Ma
t
hieu Cartau
d
[411485] Fix the CM
V
displa
y
for mov
e
s
beteen two
contai
n
ers
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-02
Mathi
e
u
C
a
r
taud
[464386] Add commit short i
d
to make l
a
bel more d
i
stinguishible
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-08-31
Mathieu Cartaud
[411485]
F
i
x
the CMV display for m
o
v
e
between two con
t
ainer
s
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree