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
Bumping versions for Oxygen.1
2017-08-23
Lau
r
e
n
t
Go
u
bet
Bumping
v
ersions for Oxygen
.
1
commit
|
commitdiff
|
tree
2017-08-23
Laurent Goubet
Removing non funct
i
onal profiles fro
m
pom
commit
|
commitdiff
|
tree
2017-08-22
La
u
r
e
n
t
G
oubet
Separat
e
core & extra builds
commit
|
commitdiff
|
tree
2017-07-21
Martin Fleck
Relax Compare Considera
t
ions o
f
IMerg
e
ViewerIte
m
s
commit
|
commitdiff
|
tree
2017-07-20
P
h
i
lip L
a
nger
Add a fe
w
mi
s
s
i
n
g
license headers
commit
|
commitdiff
|
tree
2017-07-07
Ph
i
lip Langer
R
efactorings to improve
performance
of Match
U
til
commit
|
commitdiff
|
tree
2017-07-07
Laure
n
t G
o
ubet
[518
6
12] Fr
e
quent
CME from
t
he adapt
e
r fact
o
ry
d
i
s
p
osal
commit
|
commitdiff
|
tree
2017-07-07
Marti
n
Fleck
[518979
]
Remove
con
t
ext entr
i
e
s
with
an e
m
p
t
y
cache
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin Fleck
[51901
6
] Avoid re
p
eated resour
c
e traversal when re
s
olving
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
M
artin
Fle
c
k
[519033] Do not ref
r
e
s
h t
h
e SMV viewer after e
v
ery
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Mar
t
in F
l
eck
[519023]
C
h
e
ck cancellation
l
es
s
f
r
equently in conflict
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Philip
L
an
g
er
[
516524] Use
m
ore ef
f
i
c
ie
n
t
feature look
-
u
p
in Ref
e
renceUtil
commit
|
commitdiff
|
tree
2017-07-06
Christian
W
.
Damus
[5
1
9261]
[
Oo
m
ph] Setup model
p
r
obl
e
m
s
fo
r
Oxygen
commit
|
commitdiff
|
tree
2017-07-06
Christian W
.
Damus
[51
9
170] [Checkstyle] Author format constra
i
nt
is
t
oo
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Ch
r
istian
W
.
Damus
[
5
19227] [Ch
e
cks
t
yle] S
t
yle errors in
oee
.
c
o
mpare bundle
commit
|
commitdiff
|
tree
2017-07-06
Laure
n
t Goubet
Us
e
the rele
a
s
ed version
o
f EGit
commit
|
commitdiff
|
tree
2017-06-29
Antonio
C
ampe
s
ino
Bug 518608 -
D
uplicated / Mixed Stage n
o
t
a
l
lowe
d
exception
.
.
.
commit
|
commitdiff
|
tree
2017-06-27
Martin
F
le
c
k
[487151] Accept
a
ll non-conflic
t
ing changes fails to
.
.
.
commit
|
commitdiff
|
tree
2017-06-27
M
a
r
tin
F
leck
[514415
]
Relat
i
ons
h
ips betwe
e
n diffs sh
o
uld be
cached
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[514767
]
Pro
v
ide
p
reference
s
to conf
i
gure com
p
arison
.
.
.
commit
|
commitdiff
|
tree
2017-06-26
Mar
t
in Flec
k
[507157] Check usag
e
o
f
Inp
u
tStreams
with
moc
k
i
to
commit
|
commitdiff
|
tree
2017-06-26
Ma
r
tin Fl
e
ck
[512677] Re
g
is
t
er EMFModelProvider f
o
r new Papyrus
.
.
.
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[51438
2
] Pr
e
-Merge on conflict can le
a
d to data loss
commit
|
commitdiff
|
tree
2017-06-26
Marti
n
Fleck
[514079] Implement
M
ir
r
o
r
ing: Sw
a
p le
f
t/right side
.
.
.
commit
|
commitdiff
|
tree
2017-06-12
Laurent Goubet
"spy"ing is t
h
e root cause
o
f a huge
memor
y
leak
commit
|
commitdiff
|
tree
2017-06-06
Laurent Goubet
Rev
e
rt "Refactori
n
gs to i
m
prove
p
erformance of Matc
h
Util"
commit
|
commitdiff
|
tree
2017-06-06
Laurent Goubet
Re
v
e
rt "Use more e
f
f
i
cien
t
feature l
o
ok-
u
p
in ReferenceU
t
i
l
"
commit
|
commitdiff
|
tree
2017-06-06
Philip Langer
Update Oxygen target
to new Sy
s
M
L 1
.
1 update sit
e
commit
|
commitdiff
|
tree
2017-05-12
Philip Lange
r
[516508]
C
ache unres
o
lvable proxies in No
t
LoadingResourceSet
commit
|
commitdiff
|
tree
2017-05-12
Phi
l
ip Langer
[
5
16520] Av
o
id u
n
ne
c
essary not
i
fications of comparison
.
.
.
commit
|
commitdiff
|
tree
2017-05-11
Laurent G
o
ubet
[516345] Inconsiste
n
c
y
with the l
o
g
ical model
r
e
soluti
o
n
commit
|
commitdiff
|
tree
2017-05-11
Laurent
G
oubet
Compatibility with gu
a
va 21
commit
|
commitdiff
|
tree
2017-05-09
Ma
r
tin Fle
c
k
[5
1
4
079] Default to TextMer
g
eViewe
r
res
o
u
r
ces for
i
c
ons
.
.
.
commit
|
commitdiff
|
tree
2017-05-09
Ph
i
l
i
p Lan
g
er
[509975] Se
l
ec
t
ion shou
l
d be considered for "next"
.
.
.
commit
|
commitdiff
|
tree
2017-05-09
Laurent Gou
b
et
[515039] avoid throwing ex
c
eptions dur
i
ng r
e
source
.
.
.
commit
|
commitdiff
|
tree
2017-04-11
Ale
x
a
ndr
a
Buzila
[51454
5
] egit
.
ui
p
l
ugin does not
exp
o
rt
its packages
commit
|
commitdiff
|
tree
2017-04-10
Martin
F
leck
[512562]
D
iff/m
e
rge
c
an't
h
a
ndle
m
ult
i
ple repos
commit
|
commitdiff
|
tree
2017-04-10
Philip Langer
[
5
08855]
Support
s
tarting comparis
o
ns fro
m
container
s
commit
|
commitdiff
|
tree
2017-04-07
L
a
urent
G
o
u
b
et
Bum
p
version
s
for EMF
Compare 3
.
3
.
1
commit
|
commitdiff
|
tree
2017-04-07
Stefan Dirix
[
507050] Fix confl
i
ct
merging when
pr
e
-merge is set
.
.
.
commit
|
commitdiff
|
tree
2017-04-07
L
a
urent Goubet
Mi
s
si
n
g
a
b
out
.
ht
m
l in mu
l
tip
l
e
plugins
commit
|
commitdiff
|
tree
2017-04-07
Lau
r
en
t
Goubet
Make s
u
re
we
c
annot import un
s
upport
e
d guava
v
ersions
commit
|
commitdiff
|
tree
2016-12-08
Lauren
t
G
oubet
sw
i
tch neon tp t
o
f
i
x
ed upda
t
e
sites
commit
|
commitdiff
|
tree
2016-11-22
La
u
r
ent Goub
e
t
Use obeo's github instead of axel's
commit
|
commitdiff
|
tree
2016-11-21
Laurent G
o
ubet
U
s
e
tycho 0
.
26
commit
|
commitdiff
|
tree
2016-11-03
L
a
urent Goube
t
Don'
t
build the upd
a
te site un
l
ess
i
t's using th
e
latest tp
commit
|
commitdiff
|
tree
2016-11-03
Laurent Goubet
First vers
i
o
n
of
a
n Oxyg
e
n
tp
commit
|
commitdiff
|
tree
2016-07-25
Martin Fleck
[497066] 'Pr
o
b
l
em
s
'
t
ab should not be shown automa
t
ic
a
lly
.
.
.
commit
|
commitdiff
|
tree
2016-07-25
Al
e
xandra
B
uzil
a
[494
7
63] - Stereot
y
pes
n
o
t d
i
splayed
in SMV
commit
|
commitdiff
|
tree
2016-07-12
Laurent Goubet
Do not consider a
c
ontain
e
r deletion to
c
onfli
c
t
with
.
.
.
commit
|
commitdiff
|
tree
2016-07-11
L
a
uren
t
Del
a
i
g
ue
[
4
9
7
492] Fix NPE in tooltip provider
commit
|
commitdiff
|
tree
2016-07-07
Laur
e
nt
Goubet
update t
p
to f
o
llow UML
des
i
gner
commit
|
commitdiff
|
tree
2016-06-14
La
u
rent
G
oubet
[495961] incompatibi
l
i
t
y
between log4j 1
.
x and
2
.
x
commit
|
commitdiff
|
tree
2016-05-24
Laurent Goubet
[471
1
57] StackOverflow still pres
e
n
t
on Sirius diag
r
ams
commit
|
commitdiff
|
tree
2016-05-19
La
u
ren
t
Goubet
Fix l
o
c
alization
f
or papy
r
us su
p
port
plu
g
in
commit
|
commitdiff
|
tree
2016-02-15
Stefan Dirix
[4739
8
5
]
Enable comparison dialog in pure
e
4
commit
|
commitdiff
|
tree
2016-02-08
Lau
r
ent
Goubet
Cope with AP
I
chan
g
es in Pap
y
rus
commit
|
commitdiff
|
tree
2016-01-21
Laurent
G
oubet
target platf
o
rm for Neon
commit
|
commitdiff
|
tree
2015-10-19
Axel Richar
d
[
4
75586] Re
j
ect sub-diffs
o
f rej
e
cted d
i
ffs
whe
n
casca
d
i
ng
.
.
.
commit
|
commitdiff
|
tree
2015-08-18
L
aur
e
nt G
o
u
bet
Bump
version for neo
n
M
1
commit
|
commitdiff
|
tree
2015-08-18
L
a
urent Goub
e
t
Clo
s
ing in
t
e
rnal pac
k
age from
A
PI
commit
|
commitdiff
|
tree
2015-07-31
Laurent Goub
e
t
Only m
a
rk conflicting f
i
les
as conflicting instead
.
.
.
commit
|
commitdiff
|
tree
2015-07-31
L
aurent Gou
b
et
Functio
n
al tes
t
s for t
h
e
r
emot
e
resolv
i
ng and ass
o
c
iate
d
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Axel Richa
r
d
N
e
w EMF Co
m
pare specifications
p
lugin
commit
|
commitdiff
|
tree
2015-06-22
Axel Richar
d
[453408]
F
ix SW
T
Exce
p
tion in EMFCSMV#internalRedraw()
commit
|
commitdiff
|
tree
2015-06-22
Axel Ri
c
ha
r
d
[470396] Fix
N
PE in CompareTool
B
ar
#
setEnabled(bool
e
an)
commit
|
commitdiff
|
tree
2015-06-19
Laur
e
n
t
Goubet
revert
changes to
t
he d
o
c pu
b
lisher
commit
|
commitdiff
|
tree
2015-06-18
Laurent Goubet
res
t
ore p2-p
l
ugin, rename website zip
commit
|
commitdiff
|
tree
2015-06-18
Philip Lange
r
Refa
c
tors the EM
F
Resou
r
ceMappin
g
M
erge
r
commit
|
commitdiff
|
tree
2015-06-18
Lau
r
ent Goubet
d
o
c issues - rest
o
r
e
packing, re
m
ove
m
etadata modifica
t
ion
commit
|
commitdiff
|
tree
2015-06-18
Laurent G
o
u
b
et
d
o
c
i
s
su
e
s - tes
t
-
R
e
mo
v
e nor
m
al
i
ze
commit
|
commitdiff
|
tree
2015-06-18
L
aurent G
o
ubet
doc
i
s
sues - test - Remove signing and
p
a
c
kin
g
commit
|
commitdiff
|
tree
2015-06-18
A
x
el
Richar
d
[
RelEng] Update tycho from 0
.
21 to 0
.
23
commit
|
commitdiff
|
tree
2015-06-18
Axe
l
R
i
chard
[RelEng] Update ja
r
si
g
ner vers
i
on from
1
.
0
.
5 to 1
.
1
.
2
commit
|
commitdiff
|
tree
2015-06-18
Axel Richard
Add ne
w
UML DanglingStere
o
t
ypeApplication concept
commit
|
commitdiff
|
tree
2015-06-17
Axel Ri
c
har
d
[4
6
9355]
F
ix conflicts label sho
w
s wro
n
g num
b
er
of
.
.
.
commit
|
commitdiff
|
tree
2015-06-08
Axe
l
Richard
[
D
oc] Update ge
n
erated qualifie
d
v
ersio
n
f
o
r
website
commit
|
commitdiff
|
tree
2015-06-05
Laurent
G
o
u
bet
R
estore caching
of the logic
a
l
m
odel
commit
|
commitdiff
|
tree
2015-05-18
Axel
R
ichard
[Doc] U
p
date user
g
uide
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goubet
si
g
ning is
s
ues
commit
|
commitdiff
|
tree
2015-05-06
L
aurent
Goubet
si
g
n
i
ng issues
commit
|
commitdiff
|
tree
2015-05-06
L
a
u
rent Goubet
si
g
ni
n
g i
s
sues
commit
|
commitdiff
|
tree
2015-05-06
Laurent G
o
ubet
signing issues
commit
|
commitdiff
|
tree
2015-05-06
Laurent
G
oubet
signing failures
commit
|
commitdiff
|
tree
2015-05-05
Lau
r
ent Goubet
Fix some of the warnings
commit
|
commitdiff
|
tree
2015-05-04
P
h
ili
p
Langer
[465
3
31] Delegate file additions and deletions if
m
i
s
sed
.
.
.
commit
|
commitdiff
|
tree
2015-05-04
Laurent D
e
laigue
Intr
o
duce l
o
gging with log4j
.
commit
|
commitdiff
|
tree
2015-04-30
Philip Lang
e
r
[465329] Ad
d
s test for
m
erging new
depen
d
e
n
t
b
ut n
o
t
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
Phil
i
p Lang
e
r
Extract common super class from git
tests
r
eg
a
rding
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
Philip
L
ange
r
[465329] Retur
n
the URI of the resource
to b
e
created
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
Laurent
D
elaigue
[460773] Liste
n
to resource creation durin
g
m
erge
.
commit
|
commitdiff
|
tree
2015-04-14
Lau
r
e
n
t Goubet
Introduce git-specific support to fix unus
e
a
ble
s
torage
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-07
Axel
R
ichard
[463445]
F
ix potential NPE
in E
M
FComp
a
reSt
r
uc
t
ureM
e
rgeVi
e
wer
commit
|
commitdiff
|
tree
2015-04-07
S
t
efan Di
r
ix
Upda
t
e M
a
tching
Chapter in Developer Document
a
tion
commit
|
commitdiff
|
tree
2015-04-07
Ax
e
l Richard
[4
6
2
5
50] Fi
x
resourceSetHook extension
-
pont
ID
commit
|
commitdiff
|
tree
2015-03-04
Axel Richard
[4589
6
3
]
E
M
FCompar
e
object doesn't use EMFCompareRCP
.
.
.
commit
|
commitdiff
|
tree
2015-02-18
St
e
f
a
n
Dirix
[45
2
147] Fix h
a
ndling
of di
f
fs for
i
n
terl
o
cked one
.
.
.
commit
|
commitdiff
|
tree
2015-02-10
Laur
e
nt Goube
t
P
rov
i
d
e
c
oh
e
re
n
t nam
e
s for the SDK
feat
u
res
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Laurent Goubet
Ch
a
n
ge
feat
u
re names to mo
r
e descr
i
ptive ones
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[436050] Fix copy all does
n
ot
h
ing
commit
|
commitdiff
|
tree
next