?  search:
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 Simon HausmannFix the branch mapping detection to be independent...
commit | commitdiff | tree
2007-06-16 Simon HausmannFix initial multi-branch import.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-06-12 Simon HausmannFix git-p4 rebase to detect the correct upstream branch...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-06-12 Simon HausmannMoved the code from git-p4 submit to figure out the...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-06-07 Simon HausmannFix depot-path determination for git-p4 submit
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-06-07 Simon HausmannFix git-p4 submit
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-06-07 Simon HausmannFix git-p4 rebase
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-06-07 Simon HausmannHack to make the multi-branch import work again with...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-06-07 Simon HausmannDon't attempt to set the initialParent on multi-branch...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-06-07 Simon HausmannFix common path "calculation" from logs of multiple...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-06-07 Simon HausmannFix support for "depot-path" in older git-p4 imports
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-25 Simon HausmannShortcut the case where we have no origin branch
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-25 Simon HausmannMake --with-origin the default for syncing.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-25 Simon HausmannMake --with-origin also work without origin :)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-23 Simon HausmannFix multi-branch import with --silent.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-23 Simon HausmannFix p4 execution in git-p4 rollback.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-23 Simon HausmannCatch p4 errors in rollback early enough (before deleting...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-23 Simon HausmannOops, fill the /list/ correct with the p4 exit code.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-23 Simon HausmannDon't make len(p4Cmd("p4 changes -m 1 //foo/..."))...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-23 Simon HausmannMake rollback work with locally imported branches
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-23 Simon HausmannAvoid calling git symbolic-ref refs/heads/p4//HEAD...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-22 Simon HausmannUse refs/heads/* instead of refs/heads/p4/* for local...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-22 Simon HausmannAdded support for --max-changes=<count> to ease import...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-22 Simon HausmannAdded support for importing multiple branches into...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-21 Simon HausmannFixes for rollback, delete branches that did not exist...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-21 Simon HausmannFix branch detection in multi-branch imports
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-21 Simon HausmannAdded a rollback command for debugging. It sets back...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-21 Simon HausmannMake git-p4 submit --direct safer by also creating...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-21 Simon HausmannDetect with git-p4 submit --direct when there are no...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-21 Simon HausmannFix git symbolic-ref warning on initial clone
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-21 Simon HausmannFix error detection with git-p4 submit when the requested...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-20 Simon HausmannImproved output for multi branch imports and noted...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-20 Simon HausmannSpecifying --detect-branches is now only needed for...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-19 Simon HausmannRemoved unused variable, more cleanups
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-19 Simon HausmannMore cleanups and speedups for labels and branches
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-19 Simon HausmannCleanup/speed up the branch<> file split and removed...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-19 Simon HausmannMore work on the incremental importing of multiple...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-18 Simon HausmannGive branches a nice project prefix and don't bail...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-18 Simon HausmannStarted rewriting the branch detection, based on "p4...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-18 Simon HausmannRemoved unused cache variables.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-18 Simon HausmannFix branch setup after initial clone.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-16 Simon HausmannA little todo note before I forget it :), based on...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-16 Simon HausmannFix calling git-p4 rebase from within a subdirectory...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-16 Simon HausmannGive a better hint if git-p4 submit fails
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-16 Simon HausmannAdded the possibility of skipping patches during git...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-15 Simon HausmannFix git-p4 clone //depot/project (head import)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-05-15 Simon HausmannConverted to unix newlines
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-03-23 Simon HausmannUse the new incremental import style by default
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-02-22 Simon HausmannDon't print a plain newline at the end of the execution...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-02-10 Simon HausmannAdded a little helper script to remove unused tags...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-01-31 Simon HausmannImplemented basic support for converting the date of...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-01-31 Simon HausmannSlightly improved help usage output and made specifying...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-01-31 Simon HausmannAdded basic support for specifying the depot path to...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
2007-01-30 Simon HausmannInitial import of a python script to import changesets...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 commit | commitdiff | tree
Dscho's miscellaneous git branches