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
h
i
eu Cart
a
ud
[4923
4
1
] Res Att Ch
a
nge correctly imp
l
ies
d
iff
s
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-29
Mathieu Cartaud
F
ix
g
i
t relate
d
tests
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-25
Mathieu Cartaud
F
ix error in Git tests setup
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-23
Mathieu Cartau
d
[48730
6
] U
s
e
o
nly r
e
levant
d
ia
g
no
s
tic to compute tra
v
ersals
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-19
M
a
t
h
ieu
Cartaud
[487561] Fix missing conflict on r
e
source uncon
t
rol
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-19
M
a
thieu Cartaud
Fix error in the
s
etup of EGit related tests
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-19
Ma
t
hieu C
a
rtaud
A
d
d Google G
S
ON in tar
g
et pla
t
form (required by
JG
i
t)
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-09
Mathieu
C
arta
u
d
Remove useless
method
i
n
R
e
s
ourceAttachmen
t
Chan
g
eConflictSearch
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-09
Mathie
u
Car
t
aud
Reactivate
o
rg
.
e
clipse
.
emf
.
compare
.
tests test suite
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-03
Mathieu Cartaud
[487
0
11] Fix wron
g
confl
i
ct
d
etection
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-02-01
Mathieu Cartaud
Scalable conflict detect
o
r
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-27
Mathieu Car
t
aud
Add mis
s
i
ng test suite for Neon build
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-26
M
a
thieu Car
t
aud
[
4
85266] Fix merge consequences
f
or delete/mo
v
e conflicts
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-22
M
a
thieu Cartaud
Use JGit provided progress
monitor
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-20
Mathie
u
Cart
a
ud
[
4
8
6
0
93
]
Don't
c
re
a
te log fi
l
e i
f
logs a
r
e off
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-13
Ma
t
hieu Cartaud
[48553
8
] Fix
C
lassCastException in MergeResolutionManager
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-08
Mathieu Cartaud
[484579] F
i
x
m
erge conseq
u
ence
s
algori
t
hm
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-08
Math
i
e
u
Cartaud
Add debu
g
logging
for merge ac
t
ions
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2016-01-06
Mathi
e
u Ca
r
taud
F
ix RCP
T
T bug
s
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-11-04
Mathieu Cart
a
u
d
[475935] Fix
potent
i
al Illegal
S
ta
t
eExceptio
n
in MergeViewer
I
tem
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-20
Mathieu Cartaud
[UI
t
es
t
s
] Fix
papyr
u
s
RCPTT tests
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-20
Ma
t
hieu Cartaud
[UI tests]
F
ix papyrus R
C
PTT
test
s
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-19
Mathieu Cartaud
[UI
t
ests] Add t
e
s
t
s in
v
ol
v
i
n
g
Papyrus & Egit
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-15
Mathi
e
u Cartaud
Ext
r
act
E
M
FCompareConfigura
t
i
on fr
o
m EMFCo
m
pareRCPUIPlugin
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-13
Mathieu Carta
u
d
[477769
]
Papyrus l
i
nked
Reso
u
rceAtta
c
hmentChanges
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-10-12
Mathieu Car
t
aud
F
i
x bu
g
s caused
b
y an
E
Git updat
e
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-15
Mathi
e
u
Cartaud
Fix label issues whe
n
using th
e
MergeT
o
ol on merge
.
.
.
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-09-02
M
a
thieu Cartaud
[4643
8
6] Add commit
short id
t
o make label more dist
i
nguishible
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree
2015-08-31
Ma
t
hieu Cartaud
[411485] Fix th
e
CMV display for move b
e
tween t
w
o c
o
nt
a
iners
Signed-off-by: Mathieu Cartaud <
mathieu.cartaud@obeo.fr
>
commit
|
commitdiff
|
tree