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
[442227] Compare an untracked file with HEAD.
2015-02-10
Laurent Goubet
Provid
e
coher
e
nt names for t
h
e SDK featu
r
e
s
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Laurent Goubet
Chan
g
e feature names to more descriptive ones
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-21
L
aurent
Goubet
Thi
s
parser prope
r
ty is
n
ot us
e
d b
y
the java
i
m
p
lementation
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laurent
G
oubet
Use
demandCreate instead of explicitly creating
t
he
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Lau
r
ent Goubet
Only care for containm
e
nt pro
x
ies when resolvin
g
the
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
L
a
urent Gou
b
e
t
Don'
t
u
n
load resour
c
es
,
even
f
or UML
.
Just clear out
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
La
u
rent Goubet
Make su
r
e the fac
t
ories
are
n
ot kept aroun
d
a
s single
t
on
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Lau
r
ent
G
o
ubet
List
e
n to the
correct
ex
t
ension point for the adapter
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
L
a
ure
n
t Goubet
Clear all a
d
apter
s
f
r
o
m
the comparison w
h
e
n
we're done
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goub
e
t
Properly release the c
o
ntributions we do
to the tool
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laure
n
t
G
oubet
Neve
r
u
se DISA
B
LE_NOTIFY an
d
DEF
E
R
_
ATTACHMENT l
o
ad
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Pro
p
erl
y
n
ull out
t
he
r
e
ferences we've
s
e
t on
the properties
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laure
n
t Goubet
Pu
l
l
up the removal
of the team c
o
p
y
actions from
the
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Laurent
G
o
u
bet
Do not create all TreeItems of
the s
t
ructure vi
e
wer
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Laurent
G
o
ubet
platform plugin and h
t
t
p
s
h
ould ne
v
er be
a
dde
d
to the
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-10
Laurent Goube
t
Properly dispose o
u
r gro
u
p
p
roviders
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-10
Laurent
G
oubet
Limit the
n
umber of U
R
I nor
m
alizations fro
m
t
h
e
UMLLoadOnDem
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-10
Laurent
Goubet
Remove the adapters we
c
reated f
r
om t
h
e co
m
paris
o
n
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
La
u
re
n
t
Goube
t
[4
3
7574] Proper
l
y dis
p
ose of
t
he editing domai
n
s we
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Lauren
t
Goubet
Lau
n
ch res
o
lution of
c
ross-resource proxies as soon
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
L
aurent
Goubet
Clea
n
up compare con
f
i
gura
t
ion
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Go
u
b
et
Sty
l
e
-
false is the default v
a
l
ue for booleans
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Lauren
t
Goubet
_all_ listeners are
interested in _a
l
l_ fetching noti
f
ications
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Lauren
t
Goubet
Don't
keep
the
emp
t
y gro
u
p pro
v
ider around
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent G
o
ube
t
Style - properly use the google
Pred
i
cate
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goub
e
t
Re
m
o
ve u
s
eless comparison field
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laur
e
nt Goubet
Dispose of
t
he c
o
ntent v
i
ewers
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
La
u
rent Goubet
N
u
ll out
o
ur un
d
o/redo action
s
(refer
e
nce
to doma
i
n)
commit
|
commitdiff
|
tree
2014-12-09
Lauren
t
Goubet
Re
d
uce the number of l
o
ops fr
o
m difference group cr
e
atio
n
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Lau
r
ent Goube
t
Register proxi
e
s as we
l
o
ad the xml in
s
tead of iterat
i
ng
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-08
Laurent Goubet
Match perform
a
n
c
e when
using only identifiers
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-21
Laurent Goubet
Fix
jav
a
doc of the EMFMode
l
P
r
ovider to reflect cu
r
r
ent
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
Laurent Goube
t
The C
o
nflictMerger ranking
s
hould
b
e
above that of
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
Lauren
t
Go
u
bet
[4491
6
2]
Fix Illeg
a
lStateException
:
The resource set
.
.
.
Also-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-07
Laure
n
t G
o
u
b
et
Various API i
s
sues
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
Merge "[449162]
F
i
x IllegalSt
a
t
e
Exc
e
ption: The
resour
c
e
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
Laure
n
t Gou
b
et
Fix the "copy all n
o
n-conflicting" acti
o
ns
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
Add
missing copyrights
commit
|
commitdiff
|
tree
2014-11-07
La
u
r
e
nt Goubet
Bump versions and fix new plu
g
ins for Mars M3
commit
|
commitdiff
|
tree
2014-11-04
Laurent Goub
e
t
S
u
ppress wa
r
nings on diff_match_patch
a
nd relax n
u
ll
.
.
.
commit
|
commitdiff
|
tree
2014-10-10
Laurent Goubet
Pre-m
e
rge from E
M
F logi
c
al merging
commit
|
commitdiff
|
tree
2014-10-10
Laurent Goubet
Modify merge to handle implica
t
i
o
ns properl
y
commit
|
commitdiff
|
tree
2014-10-08
Laurent G
o
ubet
Optimi
z
e
d
ic
e
coefficie
n
t storing bigram
s
withi
n
in
t
s
commit
|
commitdiff
|
tree
2014-10-08
La
u
rent Gou
b
et
Consi
d
er potentia
l
d
u
p
l
icates i
n
String similarity
commit
|
commitdiff
|
tree
2014-09-30
L
a
ur
e
nt G
o
u
bet
Cop
y
a
l
l commands didn't work with
UML
commit
|
commitdiff
|
tree
2014-08-27
Laurent
Goube
t
URIC
o
n
ver
t
ers
c
annot retu
r
n null streams
commit
|
commitdiff
|
tree
2014-08-25
Laure
n
t Goubet
Merge "[442439] Fixes DiffU
t
il
.
g
etSourceLi
s
t for moved
.
.
.
commit
|
commitdiff
|
tree
2014-08-22
Laurent Goube
t
Fix merge-related UI
f
eedback of the S
t
ruct
u
re
v
i
ew
e
r
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-20
L
a
u
rent Goubet
Only merge th
e
'many' side of an equ
i
vale
n
ce in case
.
.
.
commit
|
commitdiff
|
tree
2014-07-31
Laurent Goube
t
Merge "[4
4
0679
]
Avoi
d
s
N
PE when performing
a move"
commit
|
commitdiff
|
tree
2014-07-18
Laure
n
t
G
oub
e
t
u
pda
t
e README for
Ma
r
s dev
commit
|
commitdiff
|
tree
2014-07-18
L
auren
t
Goube
t
Avoid NPE with null monitors
commit
|
commitdiff
|
tree
2014-07-18
Laurent Goubet
N
ever
fall back to l
o
cal dat
a
f
o
r rem
o
te sides
.
commit
|
commitdiff
|
tree
2014-07-16
Laurent Goubet
Add Subversive suppo
r
t to the
b
uild and update si
t
e
commit
|
commitdiff
|
tree
2014-07-10
Laure
n
t
Gou
b
et
Al
l
ow
c
r
eation
of IComparisonScopes from a pre-co
m
puted
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
Laurent Gou
b
et
properly dispose of the git reso
u
rces in logical te
s
t
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
Laurent
G
oub
e
t
A
d
d
unit tests for
t
h
e ResourceMapping
M
e
r
ger
commit
|
commitdiff
|
tree
2014-07-08
La
u
re
n
t Goubet
The logical mod
e
l should find
incoming cross-references
commit
|
commitdiff
|
tree
2014-07-07
Laure
n
t
Goubet
pseudo conflic
t
s
should be considered auto-merge
a
b
l
e
.
commit
|
commitdiff
|
tree
2014-07-07
Laurent Goubet
F
i
rst implementation of a resource mapping merger
.
commit
|
commitdiff
|
tree
2014-07-01
L
a
ur
e
nt Goubet
Missing copy
r
ight
n
otice
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
Prepare for ResourceMappin
g
Merger
commit
|
commitdiff
|
tree
2014-07-01
Laurent G
o
u
b
et
Prep
a
re
bui
l
d for Mars
commit
|
commitdiff
|
tree
2014-07-01
Laurent G
o
u
b
et
B
ump v
e
rsio
n
s to 3
.
1
.
0 o
n
master
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
d
e
lete le
g
acy plugin
commit
|
commitdiff
|
tree
2014-07-01
La
u
rent Goube
t
remove legacy (and unbuildable
)
sysml
support
commit
|
commitdiff
|
tree
2014-06-20
La
u
r
e
nt Goubet
avoid failur
e
s comparin
g
f
iles at repository
r
o
o
t
commit
|
commitdiff
|
tree
2014-06-11
La
u
rent
G
oube
t
avoid infinite looping fro
m
g
it
w
hen resolv
i
ng fail
s
commit
|
commitdiff
|
tree
2014-06-03
L
a
urent
G
oubet
v
a
rious sonar viola
t
i
o
n
s
f
i
xes
commit
|
commitdiff
|
tree
2014-06-02
Laurent Gou
b
e
t
Model r
e
s
olving preferenc
e
s
commit
|
commitdiff
|
tree
2014-06-02
L
aur
e
n
t
Goubet
Add
G
uava 15 t
o
t
h
e accepted range
commit
|
commitdiff
|
tree
2014-05-23
La
u
r
ent Goube
t
F
i
x
r
a
n
do
m
occur
e
nces of resolvi
n
g
i
s
su
e
s
commit
|
commitdiff
|
tree
2014-05-23
Laurent
G
oubet
Limit s
c
ope
o
f resource de
l
ta reactions in the r
e
s
o
lve
r
commit
|
commitdiff
|
tree
2014-05-21
Laurent
Goubet
Merge "
H
a
n
dle can
c
el user re
q
ue
s
t thro
u
gh pro
g
ress
.
.
.
commit
|
commitdiff
|
tree
2014-05-21
Lau
r
ent G
o
ubet
Merg
e
"Add clea
r
metho
d
to Gra
p
h"
commit
|
commitdiff
|
tree
2014-05-20
Lauren
t
G
ou
b
et
tr
y
and handle git local revisions
du
r
ing
c
omp
a
ri
s
on
commit
|
commitdiff
|
tree
2014-05-20
Laurent Goubet
"
OK"
s
tat
u
s shoul
d
still displ
a
y the co
m
pa
r
ison
commit
|
commitdiff
|
tree
2014-05-19
L
aurent
Go
u
bet
temporary imp
l
ement equals for the EMFResource
M
apping
commit
|
commitdiff
|
tree
2014-05-14
Laure
n
t Goubet
enab
l
e pack
2
0
0
and in
c
lude packed artefacts
commit
|
commitdiff
|
tree
2014-05-06
L
a
urent G
o
ubet
[
434210] IndexOOB whe
n
o
p
ening resolver prferences
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
Use the shar
e
d
license feature
.
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goub
e
t
a
dding
CBI to
a
ll targets
commit
|
commitdiff
|
tree
2014-05-06
L
aurent Goubet
Ration
a
liz
e
mo
d
el resolver e
x
te
n
sion
p
oint and
u
pdate
.
.
.
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
m
o
v
e hasModelType out o
f
the
res
o
lver
commit
|
commitdiff
|
tree
2014-05-05
Laurent Goubet
re
d
uce sy
n
c
h
ronization overhe
a
d
o
f model resolving
commit
|
commitdiff
|
tree
2014-04-17
La
u
rent Goubet
s
m
all performance tweak : avoid
multiple eResource
.
.
.
commit
|
commitdiff
|
tree
2014-04-15
La
u
rent Goubet
r
emove
l
ega
c
y
j
unk in UML2 tests
commit
|
commitdiff
|
tree
2014-04-03
L
a
u
r
e
n
t
G
oubet
fix
e
ngl
i
sh
commit
|
commitdiff
|
tree
2014-04-01
Laurent Goubet
Merge "[406
5
16] Manage Parameterized Typ
e
s i
n
Comparison
"
commit
|
commitdiff
|
tree
2014-03-28
Laurent
G
oubet
Merge "Fix t
y
po for Compa
r
e With E
a
ch Ot
h
er in Dialog
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Laurent
G
oubet
Merge "
[
418472
]
Cannot merge a mov
e
from nes
t
edClassifier
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Lauren
t
Goubet
normali
z
e E
O
Ls in the core (seco
n
d pass)
commit
|
commitdiff
|
tree
2014-03-13
Laurent Gou
b
e
t
normalize EOLs
i
n t
h
e c
o
re (first p
a
s
s)
commit
|
commitdiff
|
tree
2014-03-13
La
u
rent G
o
ubet
Merg
e
"[429441] Enable/
D
isable post processo
r
s
.
"
commit
|
commitdiff
|
tree
2014-03-13
L
a
urent Goubet
normalize EOLs throughout EMF Compare
commit
|
commitdiff
|
tree
2014-03-03
Laurent Goubet
bullet list s
y
ntax
commit
|
commitdiff
|
tree
2014-03-03
Laurent Goube
t
f
ixing table syntax
commit
|
commitdiff
|
tree
2014-03-03
Lau
r
ent Goubet
Add a complete
r
eadme
t
o the repository
r
o
ot
commit
|
commitdiff
|
tree
2014-02-04
Laur
e
nt G
o
ubet
fix target pla
t
forms
u
p to H
e
lios
commit
|
commitdiff
|
tree
2014-02-04
La
u
r
e
nt Goube
t
use prop
e
r
E
Git
and s
p
lit
E
Git tests i
n
s
e
parate project
commit
|
commitdiff
|
tree
next