From: Luke Diamand <luke@diamand.org>
To: Michael Horowitz <michael.horowitz@ieee.org>
Cc: git <git@vger.kernel.org>
Subject: Re: git-p4 using notes
Date: Fri, 16 Dec 2011 19:55:59 +0000 [thread overview]
Message-ID: <4EEBA24F.8030103@diamand.org> (raw)
In-Reply-To: <CAFLRbori1Dinc2epputWfjgCOWp7M2f=+TA0w2jHq_fmRC=y3w@mail.gmail.com>
On 16/12/11 16:07, Michael Horowitz wrote:
> For those of you using git-p4 because of a company requirement to use
> Perforce, but really wish you could use git only, the most frustrating
> part is the fact that when changes are submitted, the commit message
> is rewritten to include a reference to the P4 change number which is
> used by the sync. When syncing back changes, this causes the commit
> hash to be different, and so blows away your old commit and any parent
> commit references and such.
>
> I read someplace, I can't remember where at this point, that if git-p4
> used notes to write the P4 change information, that would not impact
> the commit hash, so when merging back, things would not be
> overwritten, and you can maintain branches and commit history properly
> in git.
>
> I just ran into this project, where it seems that someone has
> re-written git-p4 to use notes: https://github.com/ermshiperete/git-p4
>
> I was wondering if any of the maintainers of git-p4 has considered
> this, and might want to leverage this work to merge into the main git
> repo, possibly with an option to choose between the two behaviors.
I'm not sure I qualify for such a grand title as maintainer, but I was
going to give this a go in the new year as it would be quite useful,
unless someone beat me to it. I want to fix some problems with labels
first though.
Regards!
Luke
next prev parent reply other threads:[~2011-12-16 19:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-16 16:07 git-p4 using notes Michael Horowitz
2011-12-16 19:55 ` Luke Diamand [this message]
2011-12-17 0:57 ` Michael Horowitz
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=4EEBA24F.8030103@diamand.org \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
--cc=michael.horowitz@ieee.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 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.