Re: git-p4: Clone p4 path with bidirectional integrations

2019-08-22 Thread Andrey
Aaron, 20.08.2019, 19:46, "Aaron Miller" : >>  Also, just FYI, as far as I know, git-p4 doesn't create "merge" commits, >>  so bidirectional integrations won't look different from ordinary commits in >> git commit graph. > > Ah, I didn't realize that, thank you. Perhaps I should just sync each >

Re: git-p4: Clone p4 path with bidirectional integrations

2019-08-20 Thread Aaron Miller
Hi Andrey, Thanks so much for this detailed response, I really appreciate it. > First of all, git-p4 should normally take only one direction from > bidirectional integrations on its own. > Do you see "p4 branch defines a mapping from to , > but there exists another mapping from to already!"

Re: git-p4: Clone p4 path with bidirectional integrations

2019-08-20 Thread Aaron Miller
Hi Luke, > It's possible that running with "-v" might give a bit more information. Here's the output from that. I've set git-p4.branchUser in this test to avoid needlessly cluttering the output since I have a huge amount of branches in my Perforce repo, but otherwise I used the exact script which

Re: git-p4: Clone p4 path with bidirectional integrations

2019-08-19 Thread Andrey
19.08.2019, 13:30, "Aaron Miller" : > Hi all, > > Is it possible to `git p4 clone --detect-branches` from a Perforce > path which contains bidirectional integrations? Yes, but it would require some manual work most likely. First of all, git-p4 should normally take only one direction from bidire

Re: git-p4: Clone p4 path with bidirectional integrations

2019-08-19 Thread Luke Diamand
On Mon, 19 Aug 2019 at 18:30, Aaron Miller 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