From: Kent Borg <kentborg@borg.org>
To: Tor Arvid Lund <torarvid@gmail.com>
Cc: git@vger.kernel.org, "Alejandro Riveira Fernández" <ariveira@gmail.com>
Subject: Re: git-p4
Date: Sun, 12 Sep 2010 13:59:21 -0400 [thread overview]
Message-ID: <4C8D14F9.90705@borg.org> (raw)
In-Reply-To: <AANLkTi=yJ5kVA17+40xc6NpEczFjgmYh7=w5k=GL_U9w@mail.gmail.com>
Tor Arvid Lund wrote:
> Ok, so if you call this on the cmd line, it should output sha1's on
> all commits that will be submitted (in reverse order) to p4. If it
> doesn't, this may well be a good place to dig for a solution.
It does output the commits it wants to submit. In my broken case far
too many.
I created a simple working case to see what working looks like, and the
exact same command outputs just the one commit. Looking more carefully
at my gitg pictures in the good and bad cases, I realize that I in the
broken case I probably don't have the graph I need.
Good case:
(master)
|
(p4/HEAD) (p4/master)
|
initial test import from existing depot
Bad case:
(master) trivial change I am trying to submit
|
(tmp) commit with the "[git-p4: depot-paths = "//depot/[...blah
blah...]": change = 160991]" string at the end of the description
|
Merge remote branch 'p4/master'
| \
| (p4/HEAD) (p4/master) a commit that is real work
| |
| more real work
| |
| more real work
| |
Merge remote branch 'p4/master'
| \|
some commit in my thrashing about
| |
| more real work
| |
. .
. .
. .
| |
| initial import of no-history linux sources that I put in manually
via Perforce
|
.
.
.
|
Linux-2.6.12-rc2
I think my understanding of merges and rebases needs more depth...and I
think I have mangled branches.
I tried a checkout of master and a "git rebase remotes/p4/master" and
that produced thousands of conflicts. Was that due to my initial Linux
sources put in on the Perforce side?
How do I untangle myself here?
I think I am about to be saved, thanks so much in advance for that!
-kb
next prev parent reply other threads:[~2010-09-12 17:59 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-10 19:54 git-p4 Kent Borg
2010-09-10 21:53 ` git-p4 Alejandro Riveira Fernández
2010-09-11 18:42 ` git-p4 Tor Arvid Lund
2010-09-12 15:30 ` git-p4 Kent Borg
2010-09-12 17:22 ` git-p4 Tor Arvid Lund
2010-09-12 17:59 ` Kent Borg [this message]
2010-09-12 19:54 ` git-p4 Tor Arvid Lund
2010-09-12 20:07 ` git-p4 Kent Borg
2010-09-12 20:12 ` git-p4 Tor Arvid Lund
2010-09-13 14:23 ` git-p4 Kent Borg
2010-09-13 15:01 ` git-p4 Tor Arvid Lund
2010-09-13 16:28 ` git-p4 Kent Borg
2010-09-13 21:58 ` git-p4 Tor Arvid Lund
2010-09-16 12:14 ` git-p4 Kent Borg
2010-09-16 13:54 ` git-p4 Tor Arvid Lund
-- strict thread matches above, loose matches on Subject: below --
2008-09-07 13:17 git-p4 dhruva
2008-09-07 13:17 git-p4 dhruva
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=4C8D14F9.90705@borg.org \
--to=kentborg@borg.org \
--cc=ariveira@gmail.com \
--cc=git@vger.kernel.org \
--cc=torarvid@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.