Re: git-p4

From: Tor Arvid Lund <torarvid@gmail.com>
Date: Sep 16, 2010, 13:54 UTC
Message-ID: <AANLkTik-jATT0vJagsXWfexPyKHFZ0oo7Qp95vpiqmCd@mail.gmail.com>
In-Reply-To: <4C920A1B.1030707@borg.org>

On Thu, Sep 16, 2010 at 2:14 PM, Kent Borg <kentborg@borg.org> wrote:

Show 8 quoted lines

> One odd thing that had me worried was seeing the git side of the gateway
> repository show a single history back and then show a short split
> history and then a single history, flopping as I ran transactions
> through it.  I am not sure what was going on, but I think git-p4 is
> doing an amend of the last commit to put its notes in the message, and
> if I have anything newer hanging from that commit this is a very bad
> thing.  I am still worried but less so as long as I behave myself about
> not expecting it to make amendments to anything but the newest commits.

This is true. git-p4 does rebase (which usually rewrites history) the active branch as the last step when you do git-p4 submit. So, as you say, it is important to be aware of this.

If HEAD points to X, and you do git-p4 submit, then if you have another branch YY on top of X, you may want to checkout YY and do git rebase X' (where X' is what git-p4 produces after it amends its [git-p4: ...] stuff).

Show 6 quoted lines

> Part of the consideration is to simply be very aware of those "[git-p4:
> ..." notes and decide where this should propagate to and design the
> workflow accordingly.  (lkml probably won't want to see p4 notations...)
>
> But anyway, I seem to have git-p4 working in both directions, with a
> complete beginning-of-time history on the git side.

Good stuff! Congrats :)

> Tor Arvid: I owe you a beer (or whatever you drink when someone offers
> you a beer), how often do you visit Boston?

Appreciated :) Well, its been ~9 years, so maybe I should go again soon :) Otherwise, say hello whenever you're in Oslo ;)

-TA-