repo.or.cz
/
fast-export.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix the branch mapping detection to be independent from the order of the "p4 branches...
2007-06-17
Sim
o
n Hau
s
mann
Fix the branch ma
p
ping detection to be independent
.
.
.
commit
|
commitdiff
|
tree
2007-06-16
Simo
n
Hausmann
Fix initial multi-branch
import
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-12
Simon Ha
u
smann
Fix git-p4 r
e
base to de
t
ect the cor
r
ect
u
pstre
a
m branch
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-12
S
i
m
o
n Hausmann
Mov
e
d
t
he
c
o
de
f
rom git-p4
s
ubmit to
figure out the
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
i
mon Hausmann
Fix depot-path determination for git-
p
4 submit
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Sim
o
n Ha
u
smann
Fix git-p4 submit
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Si
m
on Hausmann
Fix git-p4 rebase
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
i
mon Hausmann
H
a
c
k t
o
ma
k
e
the
m
ult
i
-branc
h
im
p
o
rt work
a
gai
n
with
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Do
n
't at
t
em
p
t to set the
i
nitialParent on
m
ulti-branc
h
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Fi
x
comm
o
n path "calc
u
lation" from l
o
gs of mu
l
tiple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Fix suppo
r
t for "depot-path
"
in
o
ld
e
r
git-p4
im
p
orts
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon H
a
us
m
ann
Shortcut the case
where we have no orig
i
n bra
n
ch
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon
H
ausmann
M
a
ke --
w
ith-
o
rigin the default
f
or
s
yncing
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simo
n
Hau
s
ma
n
n
Make
--with-origin also work w
i
thout origin :
)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
S
imon Hausmann
F
i
x m
u
lti-branch impor
t
with --silent
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Ha
u
sma
n
n
Fix p4 exec
u
t
ion in gi
t
-
p4 rol
l
back
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon
H
a
u
sma
n
n
Ca
t
ch p4
e
r
rors in rollback early enough (before deleti
n
g
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon
Hausmann
Oops, fi
l
l the
/list/ correct
w
ith the p4
e
x
i
t
c
ode
.
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
S
imon Hausmann
M
a
ke
r
ollb
a
ck
work wi
t
h locally
i
mported
branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon
Ha
u
smann
A
void c
a
llin
g
git symbolic-ref refs/heads/p4//H
E
AD
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hau
s
mann
Use re
f
s/h
e
ads/* instead o
f
refs/heads/p4/*
f
or lo
c
al
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Sim
o
n Hausman
n
Add
e
d support for --ma
x
-
c
h
a
nges=<count> to
e
a
s
e import
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
Added support for importing multiple bra
n
ches i
n
t
o
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
S
imon H
a
usmann
Fix
e
s
fo
r
rollback, delet
e
branches
t
h
a
t did n
o
t exist
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hau
s
mann
Fix branch detectio
n
in mu
l
ti-bra
n
ch
i
m
p
o
r
ts
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Added a r
o
llback com
m
and
f
o
r debugging
.
It s
e
t
s
back
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
S
i
mon Hausmann
Make git-
p
4 submit --direct safer
by also creating
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
S
i
mon Hausmann
D
etect
with git-p4 submit -
-
direct when there are
n
o
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hau
s
ma
n
n
Fix git symb
o
lic-ref
warni
n
g
o
n initial clone
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon
H
a
usm
a
nn
Fix e
r
r
o
r detection with gi
t
-p4
s
u
bmit w
h
en t
h
e
requested
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausma
n
n
I
mproved output for m
u
lti b
r
anc
h
impo
r
t
s
an
d
not
e
d
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Si
m
on Ha
u
smann
Sp
e
ci
f
ying --detect-
b
ranc
h
e
s
is n
o
w only needed for
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon
Hau
s
m
ann
R
e
mov
e
d unused
v
ariable,
more clean
u
p
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausmann
More cleanups and spe
e
dups for
l
abels and branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
S
i
mon Hausmann
C
leanup/sp
e
ed up the branch
<
>
file spl
i
t and
r
emoved
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausm
a
nn
More work
o
n the incremental i
m
po
r
t
i
ng of multip
l
e
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon H
a
usmann
Give branches
a
nice proje
c
t prefix and don't
b
ail
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
Started rewriti
n
g
t
he branch
d
etectio
n
,
bas
e
d on "p4
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
R
emoved
unused
c
ache
v
ar
i
ables
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausman
n
Fix
branch setu
p
after ini
t
ial clone
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
S
imon Hausmann
A little
t
odo note
before I forget i
t
:), b
a
s
e
d o
n
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon H
a
usmann
Fix calling git-p4 rebase f
r
om within a sub
d
irec
t
ory
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Si
m
on Hausma
n
n
G
ive
a
be
t
ter hint
if git-p4 submit fails
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausma
n
n
Added t
h
e pos
s
ibility of skipping p
a
t
c
hes during
git
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n Haus
m
ann
Fi
x
git-p4 clo
n
e //depot/
p
roject
(
head i
m
port)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hau
s
man
n
C
o
nve
r
ted to
unix newlines
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-03-23
Simo
n
H
a
usmann
Use the new incr
e
mental import
s
t
yle
b
y
default
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-22
Simon H
a
usmann
Don'
t
print a plain ne
w
line
a
t t
h
e en
d
of the executi
o
n
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
A
dded a little helpe
r
script to r
e
move unused tags
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Si
m
on Ha
u
smann
Im
p
le
m
ented basic supp
o
r
t f
o
r
con
v
ertin
g
the date of
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Sli
g
htly imp
r
oved help usage
o
utp
u
t and made speci
f
ying
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon
Hausmann
Added basic
sup
p
ort f
o
r
sp
e
cifyi
n
g the depo
t
pa
t
h to
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-30
Simon Hausmann
Initial
import
o
f a
pyth
o
n script to i
m
port changesets
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree