[erlang-patches] Trying to update jn/gen_stream

Raimo Niskanen <>
Tue Jul 13 19:52:13 CEST 2010


On Tue, Jul 13, 2010 at 09:57:34AM -0700,  wrote:
> > The way you did
> > it ought to work, but perhaps this fetch was missing:
> >
> > $ git fetch upstream pu
> 
> Thanks, yes that was the problem.  I could see the branch after I did that
> this weekend.  Tuncer helped me with some other commands for grabbing
> patches, etc.
> 
> My availability is spotty, but I will try to get time to work on issues
> with the test cases.  It's a bummer that some oversights on my part in the
> test code is likely what's holding it up.
> 
> > $ git branch jn/gen_stream 65f3db8de97410d3d683dbbc9419ba975232ad46
> > $ git checkout jn/gen_stream
> > $ git rebase dev
> >
> 
> You mentioned that you should be tracking my master branch and that makes
> sense to me now.  Unfortunately, when you merged in to 'pu' I assumed that
> my branch wasn't necessary, so I deleted it.  Not really an issue, but if
> I do 'git checkout jn/gen_stream' I assume I will essentially be working
> off 'pu' but it will be forward mergeable and you can pick it up properly.

Not exactly, better...

If you do 'git checkout jn/gen_stream' where you have digged out that
branch point from the merge parent in 'pu', you will find that it is
actually a branch originating from a recent 'dev'; I have rebased,
squashed and polished it a bit, but otherwise it is your original changeset.

I merge from (my version) of your branch into 'pu', therefore
your branch (my version) and where it originates is possible
to recover by dismantling 'pu'.

I heard Linus Torvalds does not keep backups of his work since
he has enough reliable people over the globe that has got
some version of his branches, so they are always possible
to resque...

> 
> jay
> 

-- 

/ Raimo Niskanen, Erlang/OTP, Ericsson AB


More information about the erlang-patches mailing list