From: tumik <tumik@tuomisalo.com>
To: git@vger.kernel.org
Subject: Re: [git-p4] Trouble importing all perforce branches into git repository
Date: Thu, 16 Jun 2011 01:28:26 -0700 (PDT) [thread overview]
Message-ID: <1308212906486-6482174.post@n2.nabble.com> (raw)
In-Reply-To: <0AC6DD14-3042-4A18-91AC-1CE77D8B4CD2@gmail.com>
Grant Limberg wrote:
>
> I think I just figured out the problem. The branch mapping between
> //project/MAIN/... and //project/Branch-foo/... was done backwards, thus
> git-p4 was expecting Branch-foo to be a parent of MAIN when the inverse
> was actually true.
>
Did you get it working so that the branch integrates at Perforce show up as
merges in git? I have been trying to do this for tens of hours now and just
can't get it working.. I have tried making the branch mapping both ways, and
even both at the same time but with no success.
I have succesfully imported the two testing branches to git, but if I look
at it in gitk for example, the history is linear and there are no merges
from the other branch (it shows up as a normal commit, without the parent
from other branch, just adding all lines that the merging did). in p4v it
shows up as it should!
--
View this message in context: http://git.661346.n2.nabble.com/git-p4-Trouble-importing-all-perforce-branches-into-git-repository-tp6383422p6482174.html
Sent from the git mailing list archive at Nabble.com.
next prev parent reply other threads:[~2011-06-16 8:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-19 19:31 [git-p4] Trouble importing all perforce branches into git repository Grant Limberg
2011-05-22 11:49 ` Pete Wyckoff
2011-05-23 3:27 ` Grant Limberg
2011-05-23 10:54 ` Vitor Antunes
2011-05-23 16:18 ` Grant Limberg
2011-05-23 17:38 ` Vitor Antunes
2011-05-23 20:06 ` Grant Limberg
2011-06-16 8:28 ` tumik [this message]
2011-06-16 8:51 ` Thomas Berg
2011-06-16 9:35 ` tumik
2011-06-16 10:05 ` Thomas Berg
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1308212906486-6482174.post@n2.nabble.com \
--to=tumik@tuomisalo.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.
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 NNTP newsgroup(s).