repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Hack to make the multi-branch import work again with self.depotPaths now that
2007-06-07
S
imon Hausmann
Hack to make the mu
l
ti-branch imp
o
rt work again with
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
i
mon H
a
usm
a
nn
D
o
n
't
a
t
t
empt
to set
t
he initia
l
Parent on multi-
b
r
a
n
ch
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausman
n
Fix common pat
h
"calcu
l
a
tion" fr
o
m
l
o
g
s
o
f mu
l
t
i
ple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Fix support for "dep
o
t-pa
t
h" i
n
older
g
it-p4 impo
r
ts
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon
H
ausmann
Shortcut
the case where we
h
ave no origin bran
c
h
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon Ha
u
smann
Make
-
-with-origin t
h
e default fo
r
sync
i
ng
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon
Hausmann
Make --
w
ith-origin also
work witho
u
t or
i
gi
n
:)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simo
n
Hau
s
mann
Fix
m
u
lti-branch import wit
h
--silent
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon
Hausmann
Fix p4 execut
i
on in git-p
4
rollback
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausma
n
n
Catch p
4
errors
i
n rollb
a
ck early
e
n
ough (
b
efo
r
e
de
l
e
ting
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simo
n
Hausman
n
O
op
s
,
f
ill th
e
/list/ correct w
i
th the
p4
e
xi
t
code
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
Don't
m
ake
le
n
(p4Cmd("p4 changes
-m 1 //fo
o
/
.
.
.
"))
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
M
ake r
o
l
l
bac
k
w
ork
w
ith
l
o
c
ally importe
d
branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Sim
o
n Ha
u
sm
a
n
n
A
v
oid
c
alling git
s
ymbolic-re
f
refs/heads/p4//HE
A
D
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon H
a
usmann
Use refs/h
e
ads/* instea
d
of
refs/he
a
ds/p
4
/* for
l
o
cal
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simo
n
Hausmann
Ad
d
ed
s
upport for --
m
ax-changes=
<
coun
t
> to
e
ase i
m
port
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
S
i
m
o
n
Hausman
n
Added supp
o
r
t
for importing mu
l
tiple branches into
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fixes for r
o
ll
b
ack,
d
elete branches that d
i
d not
e
xist
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Sim
o
n Hausma
n
n
Fix
b
ranch
detec
t
i
on in
m
u
lti-bra
n
ch
i
mpor
t
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
S
imon Ha
u
smann
Ad
d
ed a rollback c
o
mma
n
d for
debugging
.
It
sets back
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Sim
o
n
Hausm
a
nn
Make git-p4 submi
t
-
-direct
saf
e
r by als
o
creating
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
D
e
tect wi
t
h
g
i
t-p4 submit --di
r
e
ct when there are no
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Sim
o
n
H
a
usma
n
n
Fix g
i
t symbolic-
r
ef warning on initial c
l
one
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon
H
a
u
smann
Fix erro
r
detecti
o
n with git-
p
4 submi
t
wh
e
n the
reque
s
ted
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Simon Ha
u
smann
Impr
o
ved output for
mu
l
t
i
branch
i
mports and no
t
ed
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
S
i
mon Hausmann
Specifying --detect-branche
s
is now only needed for
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
S
i
mo
n
H
a
us
m
ann
R
e
moved
u
nused variable, more
c
l
e
anup
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Si
m
on Hau
s
m
ann
More cleanups and speedups fo
r
lab
e
ls an
d
branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausmann
Cleanup/sp
e
ed up
the
b
ranch<> file split and remo
v
ed
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Ha
u
s
m
ann
More
w
or
k
on the inc
r
ementa
l
importing of multiple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausm
a
nn
Give branches a nice
project
prefix
a
nd don't bail
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon
Hausmann
Started
r
e
writing the branch detection, based on "p
4
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
S
i
mon Hausmann
Removed
u
n
used cache
v
ari
a
bles
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon H
a
usmann
Fix b
r
a
nch setup
a
f
t
er init
i
al c
l
one
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
A
l
ittl
e
todo note b
e
fore I forg
e
t
it :), based on
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Fix call
i
ng git-p4 r
e
base from wi
t
hin
a
subdirectory
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
G
i
ve
a
b
e
tt
e
r hint if
g
i
t
-
p4 s
u
bmit fails
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simo
n
Ha
u
sm
a
nn
Ad
d
e
d
the poss
i
bilit
y
of skipping patches durin
g
g
i
t
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausm
a
nn
Fi
x
git
-
p4 clone
/
/depot/pro
j
ect (head import)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Conve
r
te
d
to unix
n
e
wlines
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-03-23
Simon H
a
usm
a
nn
Use
the new i
n
c
remental
import style by de
f
au
l
t
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-22
Simon H
a
usman
n
Don't print a plain newli
n
e
at the end of the execution
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausman
n
A
d
ded a l
i
ttle hel
p
er
s
cr
i
pt t
o
remove unused tags
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon H
a
usmann
Implemented
b
asic support for converting
t
h
e
date of
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
S
imo
n
Hau
s
mann
Slightly im
p
rove
d
h
e
lp usage outpu
t
and mad
e
spec
i
fying
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
au
s
m
ann
Added basic
s
u
p
port
f
o
r spec
i
f
y
in
g
the de
p
ot path to
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-30
Simon Hausman
n
I
niti
a
l impo
r
t o
f
a python scri
p
t to import changese
t
s
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree