diff options
| author | Pete Wyckoff <pw@padd.com> | 2011-12-25 02:07:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-27 18:19:30 (GMT) |
| commit | da191d15bfd690e679a9626cba527465e0aafabb (patch) | |
| tree | 2bd0ef2a11059708694f77f42402e1f5bec7eb0f /Documentation/git-p4.txt | |
| parent | ef86890ce5f01e6b5716ddcc11daddcd4e297157 (diff) | |
| download | git-da191d15bfd690e679a9626cba527465e0aafabb.zip git-da191d15bfd690e679a9626cba527465e0aafabb.tar.gz git-da191d15bfd690e679a9626cba527465e0aafabb.tar.bz2 | |
git-p4: test cloning with two dirs, clarify doc
Document how git-p4 currently works when specifying multiple
depot paths:
1. No branches or directories are named.
2. Conflicting files are silently ignored---the last change
wins.
2. Option --destination is required, else the last path is construed
to be a directory.
3. Revision specifiers must be the same on all paths for them to
take effect.
Test this behavior.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-p4.txt')
| -rw-r--r-- | Documentation/git-p4.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 201a0a0..befb217 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -276,8 +276,15 @@ p4 revision specifier on the end: "//depot/my/project@1,6":: Import only changes 1 through 6. -"//depot/proj1 //depot/proj2@all":: - Import all changes from both named depot paths. +"//depot/proj1@all //depot/proj2@all":: + Import all changes from both named depot paths into a single + repository. Only files below these directories are included. + There is not a subdirectory in git for each "proj1" and "proj2". + You must use the '--destination' option when specifying more + than one depot path. The revision specifier must be specified + identically on each depot path. If there are files in the + depot paths with the same name, the path with the most recently + updated version of the file is the one that appears in git. See 'p4 help revisions' for the full syntax of p4 revision specifiers. |