From: Pete Wyckoff <pw@padd.com>
To: Vitor Antunes <vitor.hda@gmail.com>
Cc: git@vger.kernel.org, Tor Arvid Lund <torarvid@gmail.com>
Subject: Re: [PATCH/RFC 2/2] git-p4: Add complex test case for branch import
Date: Mon, 22 Aug 2011 22:27:13 -0400 [thread overview]
Message-ID: <20110823022713.GA6005@arf.padd.com> (raw)
In-Reply-To: <20110822011319.0a013117@fenix.utopia.dhis.org>
vitor.hda@gmail.com wrote on Mon, 22 Aug 2011 01:13 +0100:
> I still need some help on the code part of this RFC patch. I really do
> not like the way it is implemented. Do you see other possible ways of
> achieving the same algorithm?
I think I understand the problem now, and have a small test case
to see what's going wrong. Your solution is definitely
sub-optimal. :) Is there anything that can be done with
--import-marks and --export-marks?
Could you guess at the branch point using p4? I.e. for each file
in the new branch, grab the change that caused its most recent
revision (the #xx part). Pick the max of those changes. In git,
find the commit whith "change = ..." that you just discovered.
That's the parent.
Even this won't be perfect, and I'm not even sure if it's less
icky than diff-tree.
-- Pete
next prev parent reply other threads:[~2011-08-23 2:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-19 0:09 [PATCH/RFC 0/2] Search for parent commit in new branch import Vitor Antunes
2011-08-19 0:09 ` [PATCH/RFC 1/2] git-p4: Search for parent commit on branch creation Vitor Antunes
2011-08-19 0:09 ` [PATCH/RFC 2/2] git-p4: Add complex test case for branch import Vitor Antunes
2011-08-20 19:12 ` Pete Wyckoff
2011-08-22 0:13 ` Vitor Antunes
2011-08-23 2:27 ` Pete Wyckoff [this message]
2011-08-23 22:02 ` Vitor Antunes
2011-08-23 23:10 ` Pete Wyckoff
2011-08-24 10:46 ` Vitor Antunes
2011-08-24 21:23 ` Vitor Antunes
2011-08-27 23:32 ` Pete Wyckoff
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=20110823022713.GA6005@arf.padd.com \
--to=pw@padd.com \
--cc=git@vger.kernel.org \
--cc=torarvid@gmail.com \
--cc=vitor.hda@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.