repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Replace \r\n with \n when importing from p4 on Windows
2007-05-24
M
a
rius Storm-Ols
e
n
Repl
a
ce \r\n wi
t
h \n when importing
from p4
on
Win
d
ows
commit
|
commitdiff
|
tree
2007-05-23
Simon Haus
m
ann
Fix multi-branc
h
import
w
i
th --silent
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Haus
m
ann
F
i
x
p4
e
x
e
cution in
g
it-p4 r
o
llbac
k
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon
Hausmann
Catch p4 errors in rollbac
k
early eno
u
gh
(before deleting
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simo
n
Hausmann
Oops,
fi
l
l th
e
/lis
t
/ correct with the p4 exit code
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Si
m
on Hausmann
D
on't
m
ake
len(p4Cmd("p
4
changes -m 1 //foo/
.
.
.
"
)
)
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Si
m
o
n
H
a
usman
n
Make rollback wo
r
k wi
t
h locally imported br
a
nch
e
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
Avoid
c
alling git sym
b
o
lic-ref r
e
fs/heads/p4//HE
A
D
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simo
n
Hausmann
Use re
f
s/heads/* inst
e
ad
of
r
e
f
s/heads/p
4
/*
for local
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Si
m
on
H
ausmann
Ad
d
ed support for --max-changes
=
<count> to ease imp
o
rt
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
Added
support for impor
t
ing multipl
e
b
r
anche
s
into
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausm
a
nn
Fixes for r
o
llb
a
c
k
,
delete branches tha
t
did
n
ot
ex
i
st
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fix branch detection in mul
t
i-br
a
nch impor
t
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Ha
u
smann
Added a rollback
c
ommand for debugging
.
It
sets back
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon
H
ausmann
M
ake git-p4 submit --di
r
ect safer
by also c
r
eating
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
S
i
mon Hausmann
Dete
c
t
with git-
p
4
s
u
bmit --direc
t
w
h
en the
r
e are no
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Sim
o
n
Hausm
a
n
n
Fix git
symbolic-ref warnin
g
on in
i
tial c
l
one
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon
Hausmann
Fix error
detection with
g
it
-
p4
s
ubmit when
t
he requeste
d
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Simon
H
ausm
a
nn
Improved outp
u
t for
m
ulti
b
ranch imports
and noted
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Simon H
a
usma
n
n
Specifying --detect-bran
c
hes is now only needed for
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Sim
o
n Hau
s
mann
Rem
o
ved unused varia
b
le
,
more cleanups
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Ha
u
smann
More cle
a
nups and speedups for
labels and branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon
H
ausm
a
n
n
Cleanup
/
speed up t
h
e
b
ra
n
ch
<
> f
i
le split
a
n
d r
e
moved
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon H
a
u
smann
M
o
re work on the in
c
rem
e
ntal importing of multiple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Ha
u
s
mann
Giv
e
branches a nic
e
pr
o
j
ect prefix and
don't
bail
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hau
s
mann
Started rewriting the branch
detection, based on "p4
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon H
a
usmann
Removed
u
nus
e
d cach
e
variables
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Haus
m
ann
Fix
b
r
anch
s
e
t
up after initial clone
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
A little todo n
o
te b
e
f
ore I forget it :),
bas
e
d on
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simo
n
Hausmann
Fix call
i
ng git-p4
rebase fro
m
w
i
t
hin
a
subdirectory
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon Ha
u
smann
Give a better hint if git-p4 submit fails
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Added
t
he possib
i
l
i
t
y of skipping patches durin
g
git
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n Hausmann
Fix
g
it-p4 clone //d
e
pot/p
r
ojec
t
(head imp
o
rt)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Marius
Storm-Olse
n
Mak
e
the command
c
a
ll
silent
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
C
o
nverted to uni
x
n
ewl
i
nes
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n Hausman
n
Make submitting work
o
n Wind
o
ws
.
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon Hausmann
Make sur
e
al
l
popen c
a
lls
use
binary mode (for
W
indows
.
.
.
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n
Hausmann
Added a little
.
b
at w
r
ap
p
er from
Marius
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on Hausma
n
n
Use the su
b
proce
s
s module i
n
st
e
ad
of pop
e
n2 to make
.
.
.
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use the n
e
w
incremental import
s
tyle by default
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hau
s
man
n
D
on't
print a plain
newline at the end of th
e
exe
c
utio
n
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Added
a little h
e
l
p
er
s
c
rip
t
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
I
m
p
lemented basic support f
o
r
conv
e
r
ting th
e
date of
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hau
s
mann
S
lightly im
p
rove
d
help usage output
and made spe
c
ifyi
n
g
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Ad
d
e
d basic support for specifying the depot path to
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-30
Sim
o
n
H
au
s
mann
Init
i
a
l
i
mp
o
r
t
of a python script
to i
m
p
ort
c
h
a
n
gesets
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree