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
[510420] Adding missing extension point definitions to the source builds
2014-11-07
Laur
e
nt Goube
t
Fi
x
the
"
copy all no
n
-c
o
nflicting" actions
commit
|
commitdiff
|
tree
2014-11-07
Laurent
G
oubet
A
d
d missing
c
o
pyrig
h
ts
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
Bump versi
o
ns and f
i
x
n
e
w
plugin
s
for Mars M3
commit
|
commitdiff
|
tree
2014-11-04
Laurent Goubet
S
u
ppress w
a
rnin
g
s
o
n
diff_m
a
tch_patch a
n
d rel
a
x
null
.
.
.
commit
|
commitdiff
|
tree
2014-10-10
L
a
urent Goubet
Pre-me
r
ge fro
m
E
M
F logical merging
commit
|
commitdiff
|
tree
2014-10-10
Laur
e
nt
G
ou
b
et
Modify merge to han
d
l
e
impli
c
a
t
ions prope
r
l
y
commit
|
commitdiff
|
tree
2014-10-08
Laurent Goub
e
t
O
p
t
imize dice
coefficient storing bigrams within
ints
commit
|
commitdiff
|
tree
2014-10-08
Laurent Goubet
Consi
d
er
p
otential duplicat
e
s
in String
s
im
i
larity
commit
|
commitdiff
|
tree
2014-09-30
Laurent Goubet
Cop
y
all co
m
mands didn'
t
work with UML
commit
|
commitdiff
|
tree
2014-08-27
Laur
e
nt
Goubet
URIConver
t
e
rs cannot ret
u
rn null st
r
e
ams
commit
|
commitdiff
|
tree
2014-08-25
Laurent Go
u
bet
M
er
g
e "[44
2
439]
Fixes Dif
f
Util
.
getSo
u
rceList fo
r
moved
.
.
.
commit
|
commitdiff
|
tree
2014-08-22
L
a
urent Goubet
Fix merge-related UI feedback of the Structure viewer
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-20
Lauren
t
Goubet
Only
m
e
r
ge the 'ma
n
y
'
s
ide of an equivalence
i
n
case
.
.
.
commit
|
commitdiff
|
tree
2014-07-31
Laurent Goubet
M
e
rge "[
4
4067
9
] Avoi
d
s NPE
w
h
e
n perf
o
rm
i
n
g
a
m
ove"
commit
|
commitdiff
|
tree
2014-07-18
Laur
e
nt
Goubet
u
pd
a
te README for Mars dev
commit
|
commitdiff
|
tree
2014-07-18
Laurent Goubet
Avoid NPE wi
t
h nu
l
l
mo
n
itors
commit
|
commitdiff
|
tree
2014-07-18
La
u
rent Goubet
Never fall back to local data for remote
sid
e
s
.
commit
|
commitdiff
|
tree
2014-07-16
L
a
u
rent Goubet
A
dd Subversive suppor
t
t
o the
b
uild and update site
commit
|
commitdiff
|
tree
2014-07-10
Laur
e
nt
Goubet
Allow
c
reation of IComparis
o
nS
c
opes
from a
p
re-compu
t
ed
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
Laurent Goube
t
properly
d
is
p
os
e
of the git resources in l
o
gic
a
l
te
s
t
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
L
aurent Goubet
Add unit tests f
o
r
the R
e
sourceMap
p
ingMerger
commit
|
commitdiff
|
tree
2014-07-08
Laurent Goubet
The logical model should f
i
n
d
i
ncom
i
n
g
cross-references
commit
|
commitdiff
|
tree
2014-07-07
Lauren
t
Goubet
pseudo conflicts should b
e
cons
i
dered auto-
m
erge
a
b
le
.
commit
|
commitdiff
|
tree
2014-07-07
Laurent
Goub
e
t
First imple
m
entation of a resource mapping me
r
ger
.
commit
|
commitdiff
|
tree
2014-07-01
Laurent
Goube
t
M
issing copyright notic
e
commit
|
commitdiff
|
tree
2014-07-01
Laurent
G
o
u
bet
Prepare for R
e
s
ourceMappi
n
gMerge
r
commit
|
commitdiff
|
tree
2014-07-01
Laurent G
o
ubet
Prepare
build f
o
r
M
ars
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
Bump versions to 3
.
1
.
0 on master
commit
|
commitdiff
|
tree
2014-07-01
Laur
e
nt Goubet
delete l
e
ga
c
y plu
g
i
n
commit
|
commitdiff
|
tree
2014-07-01
L
auren
t
Goubet
remove legacy (and unbuildabl
e
) sysml supp
o
rt
commit
|
commitdiff
|
tree
2014-06-20
Laure
n
t
Goubet
avoid failures
c
om
p
a
r
ing
fi
l
es at
repository root
commit
|
commitdiff
|
tree
2014-06-11
Laure
n
t Goubet
av
o
id
infinite loop
i
n
g
from git when r
e
solving fails
commit
|
commitdiff
|
tree
2014-06-03
Laur
e
nt Goubet
var
i
ou
s
sonar violations fixes
commit
|
commitdiff
|
tree
2014-06-02
Laurent Go
u
bet
M
odel
r
esolving
pref
e
rences
commit
|
commitdiff
|
tree
2014-06-02
L
a
urent Goubet
Add Guava 15 to t
h
e
accepted range
commit
|
commitdiff
|
tree
2014-05-23
Laure
n
t Go
u
bet
Fix random occur
e
nces of resol
v
i
ng
issues
commit
|
commitdiff
|
tree
2014-05-23
La
u
rent Go
u
bet
Limit scope of resource delta reaction
s
in the resolver
commit
|
commitdiff
|
tree
2014-05-21
Laure
n
t Goub
e
t
Merge "H
a
ndle cancel
u
ser request thr
o
ugh
p
r
ogress
.
.
.
commit
|
commitdiff
|
tree
2014-05-21
Laurent Gou
b
et
Merge "A
d
d clear method to
Graph"
commit
|
commitdiff
|
tree
2014-05-20
L
a
urent Goubet
try and
h
a
n
dle
git
local revisions
d
uring comparison
commit
|
commitdiff
|
tree
2014-05-20
Laur
e
n
t
G
ou
b
et
"OK"
s
t
a
tus s
h
o
u
ld still display the comparison
commit
|
commitdiff
|
tree
2014-05-19
La
u
re
n
t Goubet
temporary implement e
q
u
a
ls for the EMFResou
r
ceMapping
commit
|
commitdiff
|
tree
2014-05-14
Lau
r
en
t
Gou
b
e
t
e
n
able pack20
0
and in
c
lude packed a
r
tefacts
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
[434210] I
n
dexOOB
w
he
n
opening
r
e
s
o
l
ver prferences
commit
|
commitdiff
|
tree
2014-05-06
Laurent Go
u
bet
Use
t
he
shared license f
e
atur
e
.
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
a
d
d
i
n
g CBI to
all t
a
rgets
commit
|
commitdiff
|
tree
2014-05-06
Laurent G
o
ub
e
t
Ra
t
ion
a
lize model resolver
e
xte
n
sion
point and update
.
.
.
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
move hasModelType
o
u
t o
f
the resolver
commit
|
commitdiff
|
tree
2014-05-05
L
aurent
G
o
u
bet
reduce s
y
nchronization overhead of model resolvin
g
commit
|
commitdiff
|
tree
2014-04-17
Laurent Goubet
s
mall performan
c
e tweak
:
avoid mult
i
ple
e
R
e
s
our
c
e
.
.
.
commit
|
commitdiff
|
tree
2014-04-15
La
u
ren
t
Goub
e
t
r
emove le
g
acy junk
in UML2 tests
commit
|
commitdiff
|
tree
2014-04-03
Laur
e
nt Goub
e
t
f
i
x eng
l
ish
commit
|
commitdiff
|
tree
2014-04-01
Laurent
Goubet
Merge
"
[406516
]
Manage P
a
r
ameter
i
zed Typ
e
s
in Comparison"
commit
|
commitdiff
|
tree
2014-03-28
L
a
ure
n
t
Goubet
Merge
"Fix typo for Compare
W
ith Each Other in Dialog
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
L
aurent
Goubet
Merge "[418
4
72] Can
n
ot me
r
ge a mov
e
f
r
om
neste
d
Classifier
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Laurent
Goubet
normalize EOLs
in
the core (se
c
ond pass)
commit
|
commitdiff
|
tree
2014-03-13
Lauren
t
Go
u
b
e
t
normalize EO
L
s in
the co
r
e (fir
s
t pa
s
s)
commit
|
commitdiff
|
tree
2014-03-13
Laurent
G
oubet
Merge "[429441] Ena
b
le/Dis
a
ble post pr
o
c
e
ss
o
rs
.
"
commit
|
commitdiff
|
tree
2014-03-13
L
a
urent Go
u
b
e
t
normalize EO
L
s
th
r
oughout EMF Com
p
a
r
e
commit
|
commitdiff
|
tree
2014-03-03
Laurent Goube
t
bul
l
et
l
ist
syntax
commit
|
commitdiff
|
tree
2014-03-03
L
au
r
ent G
o
ubet
f
ixing ta
b
le synt
a
x
commit
|
commitdiff
|
tree
2014-03-03
Laurent
G
oube
t
Add a compl
e
te
re
a
d
me to
the repository root
commit
|
commitdiff
|
tree
2014-02-04
Laurent Goube
t
fix target platform
s
u
p
to Helios
commit
|
commitdiff
|
tree
2014-02-04
Laur
e
n
t
Goubet
use
p
roper
EGit and spl
i
t EGit t
e
s
t
s in s
e
pa
r
ate project
commit
|
commitdiff
|
tree
2014-02-03
Laurent Goubet
Revert breakages fr
o
m
t
he t
a
rget editor
.
.
.
commit
|
commitdiff
|
tree
2014-02-03
Laurent Goubet
U
s
e the proper
EGit
v
er
s
ions in Indigo a
n
d Juno
commit
|
commitdiff
|
tree
2014-02-03
Laurent Go
u
b
et
fix indigo target plat
f
orm
commit
|
commitdiff
|
tree
2014-02-03
Laurent Goube
t
Hud
s
o
n wouldn't
allow us t
o
p
r
o
perl
y
define
the set
.
.
.
commit
|
commitdiff
|
tree
2014-02-03
Lau
r
ent Go
u
bet
M
a
ke sure
w
e
r
e
main com
p
a
ti
b
l
e with Hel
i
o
s
commit
|
commitdiff
|
tree
2014-02-03
L
a
ur
e
nt Goubet
modulari
z
e
build
commit
|
commitdiff
|
tree
2014-01-31
Laurent Goubet
reve
r
ting
BREEs to Java 5, and version
s
alo
n
g with
.
.
.
commit
|
commitdiff
|
tree
2014-01-31
Lau
r
ent Goubet
fixing git tests failures
commit
|
commitdiff
|
tree
2014-01-30
La
u
ren
t
Goubet
e
xtr
a
ct fuz
z
y
i
n a
t
est frag
m
ent
commit
|
commitdiff
|
tree
2014-01-30
L
aurent Goubet
C
l
eanup for vers
i
o
n
b
u
m
ping
commit
|
commitdiff
|
tree
2014-01-29
L
a
ur
e
nt Goubet
C
hange BREEs to Jav
a
1
.
6 and activate A
P
I erro
r
for
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
La
u
r
e
nt Goubet
Comme
n
t
,
remove
useless
w
a
r
ning
s
, av
o
id API break
commit
|
commitdiff
|
tree
2014-01-28
Laur
e
nt Goubet
Merge "[426726] A "toString()" is returned for the
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
L
aurent G
o
u
bet
M
e
r
ge
"[421609] Pr
o
xi
m
i
t
yEObjectMatcher det
e
c
ts m
a
tch
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
L
au
r
ent Gou
b
et
Merge "[4216
0
9] ProximityEObjectMatc
h
er
match even
.
.
.
commit
|
commitdiff
|
tree
2013-10-18
La
u
rent G
o
ubet
Comparison fails whe
n
f
ile
s
hav
e
spaces
i
n their
n
ames
commit
|
commitdiff
|
tree
2013-10-11
Laurent Goubet
S
econd g
o
at
t
rying to disabling maven descripto
r
s
commit
|
commitdiff
|
tree
2013-10-01
L
a
urent Goubet
Update s
i
gning procedure
commit
|
commitdiff
|
tree
2013-10-01
Lauren
t
Goubet
Sharing Luna target platform (M1)
and target defi
n
i
t
i
o
n
.
.
.
commit
|
commitdiff
|
tree
2013-09-23
La
u
re
n
t Goubet
Disabling maven descriptor
(see also 401040)
commit
|
commitdiff
|
tree
2013-07-16
Laurent Goubet
Merge "Refactoring of the mer
g
ers"
commit
|
commitdiff
|
tree
2013-07-15
L
aure
n
t Goubet
Missing bits from I32b7c703d806997
3
ab8d6d90c0eb6a14ccee
3
5a3
commit
|
commitdiff
|
tree
2013-07-12
Laurent Goubet
Missing imple
m
entations of Conflict de
r
i
ved meth
o
ds
commit
|
commitdiff
|
tree
2013-07-12
Laure
n
t
G
o
ubet
M
i
nor typo
commit
|
commitdiff
|
tree
2013-07-12
Lau
r
en
t
Goubet
Include schemas in source build
.
commit
|
commitdiff
|
tree
2013-07-08
L
a
urent Goubet
Restore
ext library tests (conflict detection
is now
.
.
.
commit
|
commitdiff
|
tree
2013-07-08
Laurent G
o
ubet
Mer
g
e
"[41218
1
] Flexible del
e
gation on IdentifierEObjectMatcher"
commit
|
commitdiff
|
tree
2013-07-08
Laurent Goubet
Always
use
l
at
e
s
t
EGit
.
commit
|
commitdiff
|
tree
2013-06-24
L
aurent Goubet
I
n
vali
d
pat
h
for local
file revision,
r
e
g
r
e
ssi
o
n
introduced
.
.
.
commit
|
commitdiff
|
tree
2013-06-24
L
a
u
r
ent Goubet
Do not log warning
when
there
are not po
t
en
t
ia
l
coherence
.
.
.
commit
|
commitdiff
|
tree
2013-06-24
Laure
n
t Go
u
bet
[4
1
1
464] Dot not
use
a
view fo
r
t
h
e
traversa
l
's sets
.
commit
|
commitdiff
|
tree
2013-06-21
Laure
n
t Goube
t
Bypass EGit's
"
reposi
t
o
ry relati
v
e
p
aths"
.
commit
|
commitdiff
|
tree
2013-06-20
Lau
r
ent Goubet
Prevent logical model from
c
ontai
n
ing multiple
s
t
arti
n
g
.
.
.
commit
|
commitdiff
|
tree
2013-06-20
La
u
rent Goubet
Unit tests for the
s
cope expanding
commit
|
commitdiff
|
tree
2013-06-20
Laurent
Goub
e
t
Missing co
p
yrights, typo
commit
|
commitdiff
|
tree
2013-06-19
Laurent
G
oubet
Deprecate
u
s
e
o
f
EM
F
Compare#cre
a
t
eDef
a
u
l
tScope(
.
.
.
)
commit
|
commitdiff
|
tree
next