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
Ma
t
hieu Ca
r
taud
[492341] Re
s
Att Ch
a
nge correctl
y
implies
diffs
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-29
Mathieu Car
t
aud
Fix
g
it relate
d
t
ests
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-26
Mathieu Cartaud
[48
7
5
61] Fix issue on resource a
t
tachment move conflict
.
.
.
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-25
Mathieu Car
t
a
ud
F
ix error in Git tests
s
etup
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-23
M
athieu C
a
rtaud
[
4
8
7
3
06] Use only relev
a
nt
d
iagnostic
to com
p
ute t
r
aversals
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-19
Mathi
e
u
Cartaud
[
4875
6
1
]
F
i
x missing confl
i
ct o
n
resource uncon
t
rol
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-19
Ma
t
hie
u
C
a
rt
a
ud
Fix
e
rro
r
in the setup of
EGit r
e
la
t
ed te
s
ts
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-19
Mathieu Cartaud
Add Goo
g
l
e GSON in ta
r
g
e
t platform (requ
i
red
by JGit)
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-09
Mathie
u
Car
t
aud
R
e
mo
v
e
u
seless method
i
n ResourceA
t
tachmentCh
a
ngeCo
n
flictSearch
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-09
Ma
t
hieu Cartaud
R
eactivate org
.
eclipse
.
emf
.
compare
.
tes
t
s test suite
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-03
Mathieu C
a
rtaud
[48701
1
] Fix wr
o
ng conflic
t
de
t
ect
i
on
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-01
Mat
h
ieu Carta
u
d
Improve progress monitor
t
o
allow
ca
n
celling
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-02-01
Ma
t
hieu Cartaud
Scala
b
l
e conflict detector
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-27
Mat
h
ieu Cart
a
ud
Add missing test suite for Neon
b
uild
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-26
Mathieu Ca
r
taud
[
4
8
52
6
6] F
i
x merge
c
o
n
s
eque
n
ces f
o
r
delete/move conflicts
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-22
M
athieu Cartaud
Use JGi
t
p
ro
v
ided progress m
o
nitor
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-20
Mathie
u
Cartaud
[48609
3
] Don't create log file if
logs are off
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-13
Mat
h
ieu
Car
t
a
ud
[485538] Fix Cla
s
s
C
astException in MergeRe
s
ol
u
t
ionManag
e
r
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-08
Mathieu Cartaud
[4845
7
9] Fix me
r
ge cons
e
q
u
ences algo
r
i
t
hm
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-08
M
athieu Cartau
d
Add debug
logg
i
ng for merge actions
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2016-01-06
M
a
t
h
ieu Cartaud
Fix RCP
T
T bug
s
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-11-04
Mathieu
C
ar
t
aud
[475
9
35] Fix potent
i
al IllegalStateException in MergeViewerI
t
em
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-27
Mathieu Car
t
aud
[47319
0
] Fix
N
P
E in the
C
o
mp
a
reStruc
t
ureM
e
rgeView
e
r
.
.
.
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-20
Mathieu Cartaud
[UI tests] Fix
p
ap
y
rus
R
CPTT t
e
sts
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-20
Mathieu Cartaud
[UI tests] Fix papyrus RCPTT tests
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-19
Mathie
u
Cartaud
[UI tests] Add
t
ests involving
P
a
pyrus &
E
g
i
t
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-15
Mathie
u
Carta
u
d
Extrac
t
EMFCompareConfiguration fr
o
m
EM
F
C
ompareRCPUIPlug
i
n
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-13
M
a
thi
e
u Cartaud
[4
7
7769] Papyrus linked ResourceAttachme
n
tChanges
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-12
Mathieu Car
t
au
d
F
i
x bu
g
s caused by an
E
G
i
t
update
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-01
Mathieu
C
artaud
Imp
l
ementation of c
o
nte
x
tual tooltips
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-10-01
Mat
h
ieu Cartaud
[478032
]
Fi
x
a
ccept/reject dr
o
pdo
w
n
icon
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-30
Mathieu
C
artaud
[
4
64
3
8
6] A
d
d commit
short id t
o
make label mo
r
e distinguishi
.
.
.
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-23
Math
i
eu Ca
r
taud
Mode
l
Merge Tool + classes to do model
merges wit
h
.
.
.
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-15
Mathieu Ca
r
tau
d
Fix labe
l
is
s
ues when using the MergeTool on mer
g
e
.
.
.
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-03
Mathi
e
u
Cartaud
Implementation of
c
o
n
t
e
x
tual tooltips
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-03
Mathieu Car
t
au
d
[47
3
190] Fix NPE in the C
o
mpareStructure
M
ergeVi
e
w
er
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-02
Mathieu Ca
r
taud
A
d
d
a
proposal f
o
r the modi
f
ication of Compare UI tooltips
.
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-02
Mathieu Cartaud
[411485]
F
ix the CMV display
f
or move
s
beteen tw
o
containers
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-09-02
Mathi
e
u C
a
rt
a
ud
[4
6
43
8
6] Add
c
omm
i
t
short id to ma
k
e label more distin
g
uishible
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree
2015-08-31
Mathieu Carta
u
d
[41148
5
] Fi
x
the CMV d
i
splay for
move
between
two c
o
ntainers
Signed-off-by:
Mathieu Cartaud
<mathieu.cartaud@obeo.fr>
commit
|
commitdiff
|
tree