summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLex Spoon <lex@lexspoon.org>2015-04-20 15:00:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-04-20 19:36:00 (GMT)
commit96b2d54aeeda3af3775f571a0ab706e6f3678d7a (patch)
tree4a0c8931bff81df138c8b46c324edc185803b490 /Documentation
parent3d6bc9a763f56156b424e7382b4029a67a49847e (diff)
downloadgit-96b2d54aeeda3af3775f571a0ab706e6f3678d7a.zip
git-96b2d54aeeda3af3775f571a0ab706e6f3678d7a.tar.gz
git-96b2d54aeeda3af3775f571a0ab706e6f3678d7a.tar.bz2
git-p4: use -m when running p4 changes
Simply running "p4 changes" on a large branch can result in a "too many rows scanned" error from the Perforce server. It is better to use a sequence of smaller calls to "p4 changes", using the "-m" option to limit the size of each call. Signed-off-by: Lex Spoon <lex@lexspoon.org> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-p4.txt17
1 files changed, 14 insertions, 3 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index a1664b9..82aa5d6 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -225,9 +225,20 @@ Git repository:
they can find the p4 branches in refs/heads.
--max-changes <n>::
- Limit the number of imported changes to 'n'. Useful to
- limit the amount of history when using the '@all' p4 revision
- specifier.
+ Import at most 'n' changes, rather than the entire range of
+ changes included in the given revision specifier. A typical
+ usage would be use '@all' as the revision specifier, but then
+ to use '--max-changes 1000' to import only the last 1000
+ revisions rather than the entire revision history.
+
+--changes-block-size <n>::
+ The internal block size to use when converting a revision
+ specifier such as '@all' into a list of specific change
+ numbers. Instead of using a single call to 'p4 changes' to
+ find the full list of changes for the conversion, there are a
+ sequence of calls to 'p4 changes -m', each of which requests
+ one block of changes of the given size. The default block size
+ is 500, which should usually be suitable.
--keep-path::
The mapping of file names from the p4 depot path to Git, by