What's cooking in erlang/otp excerpt
Mon May 24 12:17:05 CEST 2010
On Sat, May 22, 2010 at 10:14:12AM -0700, Jay Nelson wrote:
> > Thanks. Included in 'pu', squashed with the original into one commit,
> > with whitespace fixes.
> > If possible, please base further work on the squashed commit,
> > i.e 540dbcc2a1fdc59e56aaf69ea9f2b0c4b59eebe4 that you can use
> > after fetching 'pu'.
> I've got the basics of git, but I always seem to have problems if I
> do anything fancy. I did 'git fetch' and 'git pull upstream dev' and
> then I could see 540dbcc with 'git log'.
> I believe I then should have just done 'git branch 540dbcc' but I
> think at some point I deleted my branch and tried again. Eventually
> I got the changes locally but when I tried to push them up, it said
> there was no remote branch.
> I have since tried lots of things, eventually getting the message
> "Your branch is ahead of 'origin/dev' by 276 commits" (not sure how
> that happened).
> I did 'rm -rf otp' and started fresh from the instructions on the web
> site to track a new branch, but I am still in the 276 commits ahead
> of dev mode and I now can no longer see 540dbcc. 'git remote -v'
> doesn't show 'pu' or any other branches, just origin and upstream.
'git remote -v' only shows you your remotes.
You probably want 'git branch -a' or 'git branch -r'.
> Anybody have any advice how to get things back in sync?
With your new repository with remotes origin and upstream
where origin is your clone and upstream is erlang/opt, e.g:
git fetch upstream pu
git branch pu upstream/pu
git checkout -b jn/gen_stream 540dbcc
> On May 21, 2010, at 3:00 AM, Raimo Niskanen wrote:
> >* jn/gen_stream (stdlib) (2010-05-17) 1 commit
> > - Add new gen_stream behaviour for efficiently consuming serial
> >streams (540dbcc)
> >This topic branch has failing test cases.
> > gen_stream is not included in the stdlib.app file.
> lib/stdlib/src/stdlib.app.src => add the following line after
> Also missing was my change to lib/stdlib/doc/src/ref_man.xml => add
> the following line after '<xi:include href="gen_server.xml">'
> <xi:include href="gen_stream.xml">
> > Although the whole pu branch could be guilty
> > this topic branch is our prime suspect.
> The line of the failure is running rr(...) I don't really see how
> gen_stream could have affected this. I may be mistaken, but it isn't
> clear how the interaction could occur.
> >Action expected from: Topic author
> >/ Raimo Niskanen, Erlang/OTP, Ericsson AB
/ Raimo Niskanen, Erlang/OTP, Ericsson AB
More information about the erlang-patches