repo.or.cz
/
egit
/
zawir.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Evaluate RevFilters before inserting parent commits to pending
2008-04-07
S
h
awn
O
.
Pear
c
e
Evaluate RevFilter
s
b
efore inserting parent
c
ommits
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pe
a
rce
R
efactor basic commit walking fr
o
m
RevWalk
t
o a
s
t
r
e
a
m
able
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
S
hawn O
.
Pearce
Implement a commit
t
ime bas
e
d
R
ev
F
ilter for before
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
S
h
a
w
n O
.
Pearce
Allow RevFilters to brea
k
o
u
t of the ma
i
n walk loop
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn
O
.
Pearce
Make
all RevFilt
e
r
i
m
p
lementations cloneab
l
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
P
earce
Impleme
n
t
a commit
f
ilter
i
ng API for RevWalk
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn
O
.
Pearce
Document the
f
l
ag c
o
n
stants
u
sed in Re
v
Walk
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shaw
n
O
.
P
e
arce
Teach RevWalk about un
i
n
terestin
g
commits
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
N
e
w r
e
v
i
sion
wal
k
i
n
g
library for jgit
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
Teach
FileM
o
de about MIS
S
ING being 0
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Sha
w
n O
.
Pearce
Teach
FileMo
d
e about S_IFG
I
TLINK b
e
ing 0
1
60
0
00
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Sh
a
wn O
.
Pea
r
ce
Teach Fil
e
Mo
d
e
h
ow to
r
e
t
u
rn
t
he pr
o
per i
n
s
t
a
nc
e
o
f
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
S
h
awn
O
.
P
ea
r
c
e
Do
n
't bother
c
ac
h
ing commits in th
e
d
elta base
c
ache
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
S
h
a
wn O
.
P
e
arce
Hand unro
l
l
t
he
Obj
e
ct
I
d
.
equals method
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shaw
n
O
.
Pearce
F
i
x the OBJECT_ID_LENGTH constan
t
a
t
20
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Sha
w
n O
.
Pearce
Only u
s
e
b
yte
s
1-5 fo
r
a
S
HA-1 ObjectId hashCode
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
Inclu
d
e refs/rem
o
t
e
s
as par
t
of the ref
s
ear
c
h pat
h
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Sh
a
wn O
.
Pearce
Correct unsigned int
e
ger conv
e
rsion is
s
ues
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
Add missing n
e
wlines a
t
e
n
d of new topl
e
v
e
l
classe
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
F
ix ArrayIndexOutOfBoundsException i
n
WindowC
a
ch
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Sha
w
n O
.
Pea
r
ce
Change the
O
bj
e
ctLoader
.
getType
method to
r
eturn
int
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
Precount the n
u
mber of t
r
ee entr
i
es durin
g
readT
r
e
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Sha
w
n O
.
Pearce
Remove unnece
s
s
ary bitwise AND masks in
r
eadTre
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pe
a
rce
Implement core
.
del
t
a
B
aseC
a
ch
e
Limit to imp
r
o
v
e unpacking
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
P
ear
c
e
Change delta
pa
c
ked object
l
oaders t
o
us
e
a P
a
ckedObje
c
tLoad
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearc
e
New Reposito
r
yConf
i
g
getIn
t
,getBoolean helper methods
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
S
h
awn O
.
P
earce
U
se a
p
roper
R
efe
r
e
nceQueue to av
o
id duplpicat
e
wi
n
dow
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn
O
.
P
e
arce
Simplify WindowCa
c
he
and Windo
w
edFile inte
r
n
al API
s
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
S
h
a
wn O
.
Pearce
Refactor Wind
o
wedFile/
W
i
ndowCache so
a
ll windows are
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shaw
n
O
.
Pea
r
ce
Change ByteW
i
ndow impl
e
me
n
t
a
tions to hold data by So
f
tReferences
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn
O
.
Pe
a
rce
M
o
d
i
fy th
e
WindowedFi
l
e
A
PI to
pass
a
r
ound a WindowCursor
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Sh
a
wn O
.
P
e
arce
Use a single WindowC
a
che for the
entire Eclipse wo
r
kspa
c
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn
O
.
P
ea
r
ce
Enable easy
access to the u
s
er's ~/
.
gitco
n
fig
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
Honor core
.
p
a
ckedG
i
tWin
d
owSize, p
a
c
k
edGitLimit,
p
ackedGitM
M
A
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
S
h
awn O
.
P
e
arce
S
u
p
p
o
rt
read
i
ng
c
o
nfi
g
fi
l
e
integ
e
rs with
k
/m/g
s
uf
f
i
x
e
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pe
a
rce
U
s
e
Java 5 bit twid
d
ling
APIs rather than han
d
-rolling
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pear
c
e
D
efer opening p
a
ck files until we actually
n
eed
object
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn
O
.
Pearce
Shuffle the
l
en
g
th of a Wind
o
wedF
i
l
e
do
w
n int
o
its
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
R
e
facto
r
P
a
ckFile construction
t
o take
t
h
e
idxFi
l
e
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
P
e
ar
c
e
R
e
fa
c
tor RepositoryState into its own top-level type
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn
O
.
Pearc
e
E
x
tract StG
i
tPat
c
h fro
m
Re
p
o
sitory to its own t
o
p-level
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn
O
.
P
earce
Cleanup mi
s
spelling in Javadoc of Repositor
y
cla
s
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
Correct
e
d name of the
m
ethod that reloads the
p
acked
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
Don't ma
k
e unit tests
d
ep
e
nd upon compressed f
i
le lengths
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
S
h
awn O
.
Pe
a
rce
Ref
a
c
tor RepositoryCon
f
ig to be
stack
e
d many level
s
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shaw
n
O
.
Pearce
Stop c
r
e
a
ti
n
g "new
f
orma
t
" lo
o
se
o
bjects a
s
C G
i
t no
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
P
e
arce
Ad
d
c
omplete re
a
d
i
ng s
u
pport for
p
ack index v2
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearc
e
Read th
e
p
ack index hea
d
er to perf
o
rm automatic ver
s
i
on
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pear
c
e
Refactor
P
ac
k
Index
.
readFully to s
u
p
p
ort reading into
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
S
h
awn
O
.
Pea
r
ce
H
o
ist
r
e
adFully and
d
ecodeUInt32 up from PackInde
x
V1
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn
O
.
P
e
arce
F
u
lly d
o
cument the PackIn
d
ex A
P
I
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
Refactor P
a
ckIndex
versio
n
1 handling code i
n
to Pac
k
Inde
x
V1
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
Move index:p
a
ck object co
u
nt checking in
t
o
PackFile
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
Don't bo
t
her checkin
g
the
i
ndex file length after r
e
ading it
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Sh
a
wn O
.
Pearc
e
Rea
d
pa
c
k
index files using F
i
leInputS
t
rea
m
and not
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
P
earce
R
e
name PackIndex
.
readIndexHeader to loadVersion1
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pearce
Refactor index rea
d
ing code from PackFi
l
e to PackI
n
de
x
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Shawn O
.
Pea
r
ce
Report pack file open failures
t
o the console
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Sh
a
w
n
O
.
Pearce
I
ncl
u
de the pa
c
k in
d
ex file
name when reporti
n
g
a bad
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-04-07
Sh
a
wn O
.
Pearce
Make
t
h
e
a
b
solute path
o
f
a
WindowedFile available
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-06-15
Shawn O
.
P
ea
r
ce
Use primi
t
i
v
e boolea
n
and n
o
t
b
oxed for return val
u
es
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-06-15
Shawn O
.
Pearce
Cleanup isModified call in isReso
u
rceChan
g
ed
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-06-11
Shawn
O
.
Pe
a
r
c
e
R
emote working direct
o
ry fr
o
m
index
writeTree
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
Shaw
n
O
.
Pea
r
ce
U
se J
a
va
5
g
enerics in Repository
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
Sha
w
n O
.
Pearce
Cor
r
ect empty statemen
t
warnings
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
S
h
aw
n
O
.
Pea
r
ce
Rem
o
ve war
n
i
n
gs about unnecessary semicolo
n
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
S
hawn O
.
Pearce
Correct E
c
l
i
pse warn
i
ng
s
about improper J2SE-1
.
5 references
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
Sha
w
n O
.
P
ea
r
ce
Make XInputStream strictl
y
packa
g
e access
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
Shawn O
.
Pearce
I
gnor
e
parame
t
er a
s
s
i
gnments within methods in j
g
i
t
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
Shawn O
.
Pearce
Mis
c
.
w
a
rning cl
e
anups
i
n XInputStream
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
S
hawn
O
.
Pearce
Remove deprecated
String c
o
n
s
t
r
u
c
tor
usage
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
Shaw
n
O
.
P
e
a
rce
Correct "var
i
able may
b
e nu
l
l" e
r
rors
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
commit
|
commitdiff
|
tree
2007-05-17
Sh
a
wn O
.
Pearce
Cleanup synthet
i
c-access w
a
rnin
g
s in all current locations
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
Sh
a
w
n
O
.
Pearc
e
Ignore unqualified field a
c
cess w
a
rn
i
ngs
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
Sh
a
wn O
.
Pearce
M
e
rge branch 'rr/t
a
gs'
commit
|
commitdiff
|
tree
2007-05-17
Sh
a
wn
O
.
Pea
r
ce
Doc
u
ment
o
ur Constants
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
S
hawn O
.
P
e
arce
D
o
c
umen
t
the Ref class
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
S
ha
w
n O
.
Pearce
Cha
n
ge Ref to
track name
,
n
ot fu
l
l file locati
o
n
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
Shaw
n
O
.
Pearce
Document RefLoc
k
a
nd
its public interface
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
Shawn O
.
P
e
arce
Convert wr
i
teS
y
mref to use RefLock
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
S
hawn
O
.
P
e
a
rce
Allow RefLock to be u
s
e
d
for other files
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-17
Sh
a
wn O
.
Pearce
Release th
e
FileLock while
o
ur s
t
ream i
s
stil
l
ope
n
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-16
Shaw
n
O
.
Pearce
All
o
w RefLo
c
k
.
wri
t
e to manage th
e
buffer
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-16
Shawn O
.
Pea
r
ce
F
lus
h
R
e
f
L
ock buffers
b
efore
r
eleasing
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-16
Shawn O
.
Pearce
D
o
cumen
t
why we cannot use unlock in R
e
fLock
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-16
Shawn O
.
Pe
a
rce
Cleanup simple w
a
rning in R
e
fLock
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-16
Shawn O
.
Pearce
Replace writeR
e
f w
i
th RefLock instances
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-08
Shawn O
.
P
earce
Discard the
index file ha
n
dle
a
fter readi
n
g it
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-05-01
Sha
w
n O
.
Pearce
I
g
nore bin
/
dire
c
tory
i
n
core
.
te
s
t
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-03-19
Shawn
O
.
Pearce
Mo
v
e GitResour
c
eNode
to ui plugin
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-03-12
Shawn O
.
Pearce
U
s
e
ASCII
e
n
c
oding for commit header
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-03-12
Shawn O
.
Pearce
S
upport commit encodin
g
header
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-02-21
Shawn O
.
Pearce
Re
l
icense org
.
spearc
e
.
jgi
t
under GPL
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-02-01
Sh
a
wn O
.
P
e
arce
Mark proje
c
t
s
which ar
e
modified
with '>', like other
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-02-01
Shawn O
.
Pea
r
c
e
Document
GitResou
r
ceDecorator and make refresh slightl
y
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-02-01
Shawn
O
.
Pearce
R
e
move unn
e
cessary {
a
n
d }
f
r
om the decorator
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-02-01
Shawn O
.
Pear
c
e
Don'
t
aggressively merge
s
u
btr
e
es
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-02-01
Shawn O
.
Pearce
Revert "Fix
m
er
g
e of subtrees"
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-02-01
Sha
w
n O
.
Pearce
Rename mergeCu
r
rentTre
e
to mergeSubtree
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-02-01
Sha
w
n
O
.
Pear
c
e
Only compute the
merge
of
s
ubt
r
ees if they diff
e
r
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
next
