repo.or.cz
/
git
/
haiku.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix git-p4 rebase
2007-06-07
Simon
Hausman
n
Fix git-p4
rebase
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Hack
to make
t
he
multi-branch i
m
port work again with
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
i
m
on H
a
u
s
m
a
n
n
Don'
t
attempt to se
t
the initialParen
t
on multi-branch
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausma
n
n
Fix
c
o
mmon path "
c
alculation" from logs of multiple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Si
m
on Hausman
n
Fix
s
u
p
p
ort
for "depot-path"
i
n older
g
i
t-p4
imports
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon Haus
m
ann
Shortcut the cas
e
where we have no origin branch
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Sim
o
n Hausmann
Make --with-origin th
e
de
f
au
l
t f
o
r sy
n
cin
g
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
S
im
o
n
H
ausmann
Make --with-origin also work w
i
tho
u
t origin :)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
S
i
m
o
n
Hausmann
Fix multi-branch
import with --silent
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Si
m
on Hausma
n
n
Fix p4 execution in git-p4 ro
l
lback
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
Catch p
4
errors in rollback early enough (b
e
fore deleting
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
Oops, fil
l
the /list/ correct with th
e
p4
e
x
it code
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Sim
o
n
Hausman
n
Don't mak
e
len(
p
4Cmd("p4 changes -m
1
//foo/
.
.
.
"))
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Ha
u
smann
M
a
k
e
roll
b
ack
wo
r
k with locally importe
d
branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Haus
m
ann
A
void calling git s
y
mbolic
-
re
f
r
e
fs/heads
/
p
4//HEAD
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausman
n
Us
e
refs/heads/* instead of refs
/
heads/p4/* for local
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
S
i
mon
Hausmann
Added support for --ma
x
-changes=<count> to ease im
p
ort
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon Haus
m
ann
Add
e
d
s
upport for importing multipl
e
branches
i
nto
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Ha
u
s
m
ann
Fi
x
es fo
r
r
o
l
lba
c
k
,
delete b
r
anch
e
s
that did not exist
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fix branch de
t
ection
in multi-branch imports
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon
Hausma
n
n
Added a
rollback comman
d
for
d
ebuggi
n
g
.
I
t
sets back
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Si
m
on Hau
s
mann
Make git
-
p
4
s
ubmit -
-
d
i
r
ect
s
a
fer by
also
c
r
eating
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausm
a
nn
Detect with
git-p4
s
ubmit --direct whe
n
the
r
e are no
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simo
n
H
au
s
mann
Fix git
s
ymbolic-ref w
a
rning
on initial clone
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
F
ix e
r
r
or det
e
ction wit
h
git-p4 submit
w
h
e
n
th
e
requested
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
Improved output for multi branch imp
o
rts and n
o
ted
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Simon
H
ausmann
Specify
i
ng -
-
det
e
ct-branches is
now
o
nly needed for
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
S
i
m
on Hausmann
Rem
o
ved u
n
used variable, more cleanup
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Sim
o
n
H
ausma
n
n
More clea
n
u
ps and
s
peedups
for
l
a
bel
s
and branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simo
n
Hausmann
Clean
u
p/speed u
p
the branch<
>
fil
e
spli
t
and r
e
m
oved
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Si
m
on Haus
m
ann
M
ore work on
t
he incremental im
p
ortin
g
of multi
p
l
e
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
S
i
mon Hausmann
Give
bra
n
c
h
es a
n
ice project pre
f
ix a
n
d don
'
t bail
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
S
i
mon Hausmann
Started r
e
writing
t
h
e
b
r
anch detection, base
d
o
n "p4
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
S
i
mon Hausm
a
n
n
R
em
o
ved
unuse
d
cache variables
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Si
m
on H
a
usmann
Fix branch set
u
p after ini
t
i
a
l clon
e
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausman
n
A little tod
o
note bef
o
re I f
o
r
g
e
t
it :), b
a
sed o
n
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Fi
x
calling gi
t
-p4 rebas
e
fr
o
m
w
it
h
i
n a s
u
bdirectory
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon H
a
u
smann
G
i
ve a b
e
tter hint if git-p4 submit fails
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hau
s
mann
Added t
h
e possibility of ski
p
ping patches during git
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausma
n
n
Fix git-p4 clo
n
e //depot/project (head import)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n
Hausmann
Con
v
erted
t
o unix newlines
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-03-23
Simon
H
ausmann
Use the ne
w
incremen
t
al import style by default
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-22
Simo
n
H
a
usmann
Don't print a
plain newline at the
e
nd of
the e
x
ecution
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-10
S
imon Hausmann
A
d
ded a little helper scr
i
pt
t
o r
e
mo
v
e unused tags
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
sma
n
n
Im
p
lemented bas
i
c support for
convertin
g
the date of
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon Haus
m
a
nn
Slightly
i
m
prove
d
help u
s
age output
a
nd made specifying
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Ad
d
ed ba
s
ic
s
upport for specifying th
e
depot path to
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-30
Simon Hausmann
Initial
i
mport o
f
a python scri
p
t to import changesets
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree