From: Luke Diamand <luke@diamand.org>
To: Aaron Miller <aaronkmiller@gmail.com>
Cc: Git Users <git@vger.kernel.org>
Subject: Re: git-p4: Clone p4 path with bidirectional integrations
Date: Mon, 19 Aug 2019 21:23:06 +0100 [thread overview]
Message-ID: <CAE5ih78UOor3XT_hDofanoGUPLD1BC2y=pCbzF-Edm2mpRvjyQ@mail.gmail.com> (raw)
In-Reply-To: <CALSvhyb7Td-ugzze9cSLXRjF78w=zE5=3yuMFZVeuXsCWLSjHg@mail.gmail.com>
On Mon, 19 Aug 2019 at 18:30, Aaron Miller <aaronkmiller@gmail.com> wrote:
>
> Hi all,
>
> Is it possible to `git p4 clone --detect-branches` from a Perforce
> path which contains bidirectional integrations?
>
> I've tried a bunch of things to get this to work, but here's an
> example which hopefully illustrates what I'm trying to accomplish
> and the issue I'm having.
I have to admit I don't use the detect-branches code myself.
It's possible that running with "-v" might give a bit more information.
Can you write a test case, or even just a shell script, that might
help figure out what's going on.
Unfortunately Perforce doesn't really know about branches, so git-p4
has to make a guess!
>
> Perforce setup, assuming PWD is mapped to //depot/... in your client spec:
>
> 1. mkdir -p testing/master
> 2. touch testing/master/test1 && p4 add testing/master/test1 && p4 submit
> 3. p4 integrate //depot/testing/master/...
> //depot/testing/staging/... && p4 submit
> 3. touch testing/staging/test2 && p4 add testing/staging/test2 && p4 submit
> 4. p4 integrate //depot/testing/staging/...
> //depot/testing/master/... && p4 submit
>
> Now try to clone with git-p4:
>
> 1. git init p4_git_test && cd p4_git_test
> 2. git config git-p4.branchList master:staging
> 3. git config --add git-p4.branchList staging:master
> 4. git p4 clone //depot/testing/...@all --detect-branches .
>
> You end up with a failure like:
>
> Importing from //depot/testing/...@all into .
> Reinitialized existing Git repository in /home/amiller/p4_git_test/.git/
> Importing revision 1205832 (25%)
> Importing new branch testing/master
>
> Resuming with change 1205832
> fatal: ambiguous argument 'refs/remotes/p4/testing/staging': unknown
> revision or path not in the working tree.
> Use '--' to separate paths from revisions, like this:
> 'git <command> [<revision>...] -- [<file>...]'
> Command failed: ['git', 'rev-list', '--reverse', '--no-merges',
> 'refs/remotes/p4/testing/staging']
>
> I'm using Git 2.22.1.
>
> Thanks,
> Aaron
next prev parent reply other threads:[~2019-08-19 20:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 17:29 git-p4: Clone p4 path with bidirectional integrations Aaron Miller
2019-08-19 20:23 ` Luke Diamand [this message]
2019-08-20 22:52 ` Aaron Miller
2019-08-20 2:14 ` Andrey
2019-08-20 23:45 ` Aaron Miller
2019-08-23 3:06 ` Andrey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAE5ih78UOor3XT_hDofanoGUPLD1BC2y=pCbzF-Edm2mpRvjyQ@mail.gmail.com' \
--to=luke@diamand.org \
--cc=aaronkmiller@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).