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
Corrects labels after enhancement on conflicts label.
2014-10-10
Lau
r
ent
Goubet
Pre-merge
f
rom EMF logical merging
commit
|
commitdiff
|
tree
2014-10-10
Laurent Goubet
Modify
m
erge t
o
handle implications pr
o
perly
commit
|
commitdiff
|
tree
2014-10-08
Laurent G
o
ubet
Optimize
dice coefficien
t
st
o
ri
n
g bigrams w
i
thin ints
commit
|
commitdiff
|
tree
2014-10-08
L
a
u
r
ent Goubet
Conside
r
potenti
a
l duplicates in String
si
m
ilarity
commit
|
commitdiff
|
tree
2014-09-30
Lau
r
e
n
t
Goubet
Copy al
l
commands didn't w
o
rk with U
M
L
commit
|
commitdiff
|
tree
2014-08-27
L
a
ure
n
t Goubet
URICon
v
erters cannot
r
eturn null streams
commit
|
commitdiff
|
tree
2014-08-25
L
aurent Gou
b
et
M
e
r
ge "[442439] Fixes DiffUtil
.
getSourceList for moved
.
.
.
commit
|
commitdiff
|
tree
2014-08-22
Lauren
t
Goubet
Fix merge-r
e
lated
U
I feed
b
a
c
k of
th
e
S
tructure viewer
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-20
Laurent G
o
ubet
Only merge the 'ma
n
y
'
s
ide of
an equivale
n
c
e
in case
.
.
.
commit
|
commitdiff
|
tree
2014-07-31
L
auren
t
Gou
b
et
M
e
rge "[440
6
79] Avoids N
P
E
w
hen perfo
r
min
g
a move"
commit
|
commitdiff
|
tree
2014-07-18
Lauren
t
Goub
e
t
update READM
E
for Mars de
v
commit
|
commitdiff
|
tree
2014-07-18
Laurent Goubet
Avoid NP
E
wit
h
nul
l
monitor
s
commit
|
commitdiff
|
tree
2014-07-18
Laure
n
t Goubet
Ne
v
er fall back to local d
a
ta
f
or remote sides
.
commit
|
commitdiff
|
tree
2014-07-16
L
a
ure
n
t Goubet
Add Sub
v
er
s
ive support to the build and up
d
a
te site
commit
|
commitdiff
|
tree
2014-07-10
Laurent Goubet
Allow creation of
I
Comparison
S
copes
f
r
o
m
a pre-computed
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
Laure
n
t Goubet
p
r
ope
r
ly dispose
o
f the git res
o
urc
e
s
i
n log
i
cal t
e
st
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
Laurent
Goubet
Add unit tests for the ResourceMappingMerger
commit
|
commitdiff
|
tree
2014-07-08
Lau
r
e
n
t Goubet
The logi
c
al mod
e
l shoul
d
f
i
nd incom
i
n
g
c
r
oss-re
f
e
r
ence
s
commit
|
commitdiff
|
tree
2014-07-07
L
au
r
ent Goubet
p
s
eudo conflicts should be
considered auto-mer
g
eable
.
commit
|
commitdiff
|
tree
2014-07-07
L
aurent Goubet
First imple
m
entation of
a resour
c
e mapping merger
.
commit
|
commitdiff
|
tree
2014-07-01
Laur
e
nt Goub
e
t
M
issing copyright no
t
ic
e
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goube
t
Prepare for Resour
c
eMa
p
p
i
n
g
Merg
e
r
commit
|
commitdiff
|
tree
2014-07-01
Lau
r
en
t
Goubet
Prepar
e
build
f
or
Mars
commit
|
commitdiff
|
tree
2014-07-01
Lauren
t
G
ou
b
e
t
B
ump
v
ersions to 3
.
1
.
0 on mast
e
r
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goub
e
t
delete
l
egacy
p
lugin
commit
|
commitdiff
|
tree
2014-07-01
Laur
e
nt Goubet
re
m
ove leg
a
cy (and
u
nbuildable) sysml s
u
pport
commit
|
commitdiff
|
tree
2014-06-20
La
u
rent
Gou
b
e
t
avo
i
d
failures comparing files a
t
repository root
commit
|
commitdiff
|
tree
2014-06-11
Laur
e
nt Goubet
avoid infinite looping from git when resolving fails
commit
|
commitdiff
|
tree
2014-06-03
Laurent Goubet
v
arious
sonar violati
o
ns fi
x
es
commit
|
commitdiff
|
tree
2014-06-02
Laurent Goubet
Model resolving preferences
commit
|
commitdiff
|
tree
2014-06-02
Laurent G
o
ub
e
t
Add Guava 15
t
o
t
he accepted range
commit
|
commitdiff
|
tree
2014-05-23
Lauren
t
G
oubet
Fix random occ
u
r
en
c
e
s
o
f
resolving is
s
ues
commit
|
commitdiff
|
tree
2014-05-23
Laur
e
n
t
Goub
e
t
Li
m
it
sco
p
e of resource delta rea
c
tio
n
s in the resolver
commit
|
commitdiff
|
tree
2014-05-21
Lau
r
ent Goubet
Merge "Hand
l
e can
c
el use
r
reque
s
t through
p
rogres
s
.
.
.
commit
|
commitdiff
|
tree
2014-05-21
Laurent
G
o
u
bet
Merge "Add cle
a
r method t
o
G
r
a
ph"
commit
|
commitdiff
|
tree
2014-05-20
Laur
e
n
t
Goub
e
t
try and
h
andle git local revisions during com
p
aris
o
n
commit
|
commitdiff
|
tree
2014-05-20
La
u
rent Goubet
"OK" status sh
o
ul
d
stil
l
disp
l
ay the comparison
commit
|
commitdiff
|
tree
2014-05-19
Lau
r
ent Goubet
tempo
r
ary im
p
l
e
ment equals for th
e
EMFR
e
sourceMap
p
ing
commit
|
commitdiff
|
tree
2014-05-14
Laurent
G
ou
b
et
e
na
b
l
e pack200 and include packed
art
e
f
a
ct
s
commit
|
commitdiff
|
tree
2014-05-06
Lau
r
ent Go
u
bet
[4
3
4
210
]
IndexOOB when opening reso
l
ver prferen
c
es
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
Use the
shared license feature
.
commit
|
commitdiff
|
tree
2014-05-06
Lau
r
ent
G
o
u
be
t
a
d
ding
C
BI
t
o
all targets
commit
|
commitdiff
|
tree
2014-05-06
Laurent Go
u
bet
Rationaliz
e
m
o
del resolver extensi
o
n point
and upd
a
te
.
.
.
commit
|
commitdiff
|
tree
2014-05-06
L
a
uren
t
G
oubet
move hasMode
l
Type
o
ut
o
f the
r
e
solver
commit
|
commitdiff
|
tree
2014-05-05
L
a
urent Goubet
reduce synchroni
z
ation
o
v
e
rhead of model resolving
commit
|
commitdiff
|
tree
2014-04-17
Laurent G
o
u
bet
small perfo
r
mance
tweak : av
o
id
m
ult
i
ple
e
Resource
.
.
.
commit
|
commitdiff
|
tree
2014-04-15
La
u
r
e
nt Goub
e
t
r
e
m
ove leg
a
cy junk in UML2
tests
commit
|
commitdiff
|
tree
2014-04-03
Laurent Goubet
f
ix englis
h
commit
|
commitdiff
|
tree
2014-04-01
Laure
n
t Gou
b
et
Merge "[406516] Manage
P
ara
m
eterized
Ty
p
es in Comparison"
commit
|
commitdiff
|
tree
2014-03-28
Laure
n
t
G
oub
e
t
Merge "Fix ty
p
o
f
or Compare With Each Other in Dialog
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Lauren
t
Goubet
Merge "[418472] Cannot merg
e
a move fro
m
nes
t
edClas
s
ifie
r
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Lau
r
en
t
Gou
b
et
normali
z
e
E
OLs in the core (s
e
cond pa
s
s)
commit
|
commitdiff
|
tree
2014-03-13
L
a
u
re
n
t Goub
e
t
n
ormali
z
e EO
L
s in
t
he c
o
re (
f
irst pa
s
s)
commit
|
commitdiff
|
tree
2014-03-13
Laurent Goubet
M
erg
e
"[429441
]
Enable/Disable post processo
r
s
.
"
commit
|
commitdiff
|
tree
2014-03-13
Laurent Goubet
normalize EOLs thr
o
ug
h
out EMF Compare
commit
|
commitdiff
|
tree
2014-03-03
L
aur
e
nt Goube
t
bullet list syntax
commit
|
commitdiff
|
tree
2014-03-03
L
a
ure
n
t
Goub
e
t
fixing table syntax
commit
|
commitdiff
|
tree
2014-03-03
L
a
u
r
ent Goube
t
A
d
d
a
complet
e
readme to
t
he re
p
osi
t
ory roo
t
commit
|
commitdiff
|
tree
2014-02-04
L
a
urent Goubet
fix target platform
s
up to Helios
commit
|
commitdiff
|
tree
2014-02-04
Laurent G
o
ubet
use pr
o
per
E
G
it an
d
split EGit tests in separate project
commit
|
commitdiff
|
tree
2014-02-03
Laurent Goubet
Revert breakages f
r
o
m the target ed
i
tor
.
.
.
commit
|
commitdiff
|
tree
2014-02-03
Laurent Goub
e
t
Use the proper EGit ver
s
ions
i
n Indigo and
Juno
commit
|
commitdiff
|
tree
2014-02-03
Laurent Goubet
fix i
n
digo target platfo
r
m
commit
|
commitdiff
|
tree
2014-02-03
La
u
rent Goubet
Hudson wo
u
l
dn't allow
us to
pr
o
perly defi
n
e the set
.
.
.
commit
|
commitdiff
|
tree
2014-02-03
L
a
u
rent Goubet
Make sure we remain compatible
w
ith
H
elios
commit
|
commitdiff
|
tree
2014-02-03
Laure
n
t Go
u
bet
modu
l
arize bu
i
ld
commit
|
commitdiff
|
tree
2014-01-31
Laurent Go
u
bet
rever
t
i
ng BREEs to Java 5, and versions along with
.
.
.
commit
|
commitdiff
|
tree
2014-01-31
L
auren
t
Goub
e
t
fixi
n
g g
i
t
test
s
fa
i
lures
commit
|
commitdiff
|
tree
2014-01-30
Laurent Goubet
extract f
u
zz
y
i
n
a tes
t
f
r
agmen
t
commit
|
commitdiff
|
tree
2014-01-30
La
u
re
n
t Goubet
Cle
a
n
u
p for version bu
m
ping
commit
|
commitdiff
|
tree
2014-01-29
Lau
r
ent Goubet
Chan
g
e BREEs to Ja
v
a
1
.
6 and ac
t
ivate API error for
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
Lauren
t
Goubet
Comm
e
nt, r
e
move useless w
a
rnings
,
avoid API b
r
eak
commit
|
commitdiff
|
tree
2014-01-28
Laur
e
nt Goub
e
t
Merge "[426726
]
A "toString()" is r
e
turned for the
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
Laurent Go
u
bet
Merge
"[421609] ProximityEObjectMat
c
her dete
c
ts mat
c
h
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
Laurent Goubet
M
e
rge "[4
2
1609] ProximityEObje
c
tMatch
e
r m
a
tch even
.
.
.
commit
|
commitdiff
|
tree
2013-10-18
Lau
r
ent Gou
b
e
t
C
o
mparison fail
s
wh
e
n files have
s
pac
e
s in th
e
ir nam
e
s
commit
|
commitdiff
|
tree
2013-10-11
Laurent Goube
t
Sec
o
nd go at trying to dis
a
bli
n
g m
a
ven des
c
riptors
commit
|
commitdiff
|
tree
2013-10-01
Laurent Goub
e
t
Up
d
ate signin
g
proc
e
dure
commit
|
commitdiff
|
tree
2013-10-01
L
aur
e
nt Goubet
Sharing Luna targ
e
t
p
l
atf
o
rm (
M
1
)
and
t
a
rget
d
efinition
.
.
.
commit
|
commitdiff
|
tree
2013-09-23
Lau
r
e
n
t Goube
t
Disabling maven descript
o
r (see also
4
0
104
0
)
commit
|
commitdiff
|
tree
2013-07-16
Laurent
Gou
b
et
Merge "Refactoring of the mer
g
ers"
commit
|
commitdiff
|
tree
2013-07-15
Laurent Goube
t
Mis
s
i
ng bits from I32
b
7c
7
0
3
d8069973ab8d6d90c0eb6a14ccee35a3
commit
|
commitdiff
|
tree
2013-07-12
La
u
re
n
t
Goubet
Missing
i
mplementations
of Confli
c
t derived methods
commit
|
commitdiff
|
tree
2013-07-12
Laurent Goubet
M
i
nor typo
commit
|
commitdiff
|
tree
2013-07-12
Laurent Goubet
Incl
u
de
schem
a
s in s
o
urce bui
l
d
.
commit
|
commitdiff
|
tree
2013-07-08
Laurent G
o
u
b
et
Resto
r
e ext l
i
b
r
a
ry tests (
c
o
n
fl
i
ct de
t
ection is now
.
.
.
commit
|
commitdiff
|
tree
2013-07-08
Laurent Goubet
Merge "[41
2
1
81] Flexible delegatio
n
on
I
dent
i
fierEOb
j
ectMatcher"
commit
|
commitdiff
|
tree
2013-07-08
Laurent Goub
e
t
Alway
s
us
e
latest EGit
.
commit
|
commitdiff
|
tree
2013-06-24
Lauren
t
Go
u
bet
I
n
valid path for local
f
ile revision, regres
s
i
o
n
in
t
roduced
.
.
.
commit
|
commitdiff
|
tree
2013-06-24
Laurent Goubet
Do not lo
g
warning when
there are
n
o
t
potential
cohere
n
c
e
.
.
.
commit
|
commitdiff
|
tree
2013-06-24
Laurent Goubet
[4114
6
4] Dot
not use a view f
o
r
t
he
travers
a
l
'
s sets
.
commit
|
commitdiff
|
tree
2013-06-21
La
u
rent
G
oubet
Bypass EGit's "repository relat
i
ve paths"
.
commit
|
commitdiff
|
tree
2013-06-20
Laur
e
n
t Go
u
bet
P
r
ev
e
nt logical model fro
m
co
n
t
a
ining mu
l
ti
p
le starting
.
.
.
commit
|
commitdiff
|
tree
2013-06-20
Laurent Goubet
Unit tests for
the sco
p
e expanding
commit
|
commitdiff
|
tree
2013-06-20
Laure
n
t G
o
ubet
Missing
c
opyrights,
typo
commit
|
commitdiff
|
tree
2013-06-19
Laurent Goubet
Deprecate use o
f
EMFCompare
#
createDefaultScope(
.
.
.
)
commit
|
commitdiff
|
tree
2013-06-19
La
u
rent G
o
ube
t
C
a
che t
h
e dependency
gr
a
p
h as Team calls it _a lot_
commit
|
commitdiff
|
tree
2013-06-18
L
au
r
ent Go
u
bet
U
s
eles
s
cod
e
, resources,
a
nd warn
i
ngs
commit
|
commitdiff
|
tree
2013-06-18
L
a
u
ren
t
Goubet
In
t
roduce
e
x
tens
i
on p
o
int for
the mo
d
el resolvers
.
commit
|
commitdiff
|
tree
2013-06-18
L
aur
e
nt Goube
t
[
4
0
9
374] Co
n
sider RessourceAttachm
e
ntChanges in requirements
commit
|
commitdiff
|
tree
next