From: Tor Arvid Lund <torarvid@gmail.com>
Date: Sun, 12 Sep 2010 20:12:23 GMT
Subject: Re: git-p4
Message-ID: <AANLkTikrSt4djXep-o4Hr8EZAsiNXnqCHa2fLrys8T==@mail.gmail.com>
In-Reply-To: <4C8D3303.1030302@borg.org>

2010/9/12 Kent Borg <kentborg@borg.org>:
> Tor Arvid Lund wrote:
>> When messing about with git-p4 I have sometimes messed up that
>> p4/master ref myself. I can normally fix it by setting it manually
>
> Um, I maybe just did that before I saw your e-mail.
>
> I edited:
>
>  .git/info/refs
>  .git/ORIG_HEAD
>  .git/packed/refs
>
> ...and put in the sha1 of the "[git-p4:"-commit.
>
> When I now do:
>
>  $ git rev-list --no-merges remotes/p4/master..master
>
> I get just the one commit that I hoped to get!
>
> ...did I just fix it?

My guess: Yes! :)

> I don't have time to try the "git p4 submit" now, I am going to be late
> in meeting my wife.  Tomorrow morning...will it work?

I'm optimistic :)

-TA-