| Author |
Message |
|
| jay |
 Posted: Fri Jul 09, 2010 8:14 pm |
 |
|
|
User
Joined: 06 Sep 2006
Posts: 139
Location: Los Angeles, CA USA
|
I did a fresh synch with dev and tried to merge in the pu topic
jn/gen_stream, but I can't seem to find it. I did the following.
git pull upstream dev
make
make release_docs
$ERL_TOP/bin/erl => R14B
git push origin origin:refs/heads/gen_stream_track_test_procs
git checkout --track -b gen_track_test_procs
git log --oneline origin/pu | grep jn
aaeb58c Merge branch 'jn/ic-docs-without-java' into pu
333d2b2 Merge branch 'jn/sasl-format_report' into ccase/r13b04_dev
61489dd Merge branch 'jn/supervisor_child_count_only' into ccase/r13b04_dev
git branch -f jn/gen_stream 65f3db8^2
fatal: Not a valid object name: '65f3db8^2'
git branch -f jn/gen_stream 65f3db8
fatal: Not a valid object name: '65f3db8'
I guess starting from 'dev' was not a good thing, although I did want to
verify that I can build and run tests in dev properly.
How do I find my project in 'pu' and properly create a tracking branch
that I can use to update it?
jay
________________________________________________________________
erlang-patches (at) erlang.org mailing list.
See http://www.erlang.org/faq.html
To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
Post received from mailinglist |
|
|
| Back to top |
  
|
| jay |
| Posted: Fri Jul 09, 2010 8:14 pm |
|
|
|
User
Joined: 06 Sep 2006
Posts: 139
Location: Los Angeles, CA USA
|
I did a fresh synch with dev and tried to merge in the pu topic
jn/gen_stream, but I can't seem to find it. I did the following.
git pull upstream dev
make
make release_docs
$ERL_TOP/bin/erl => R14B
git push origin origin:refs/heads/gen_stream_track_test_procs
git checkout --track -b gen_track_test_procs
git log --oneline origin/pu | grep jn
aaeb58c Merge branch 'jn/ic-docs-without-java' into pu
333d2b2 Merge branch 'jn/sasl-format_report' into ccase/r13b04_dev
61489dd Merge branch 'jn/supervisor_child_count_only' into ccase/r13b04_dev
git branch -f jn/gen_stream 65f3db8^2
fatal: Not a valid object name: '65f3db8^2'
git branch -f jn/gen_stream 65f3db8
fatal: Not a valid object name: '65f3db8'
I guess starting from 'dev' was not a good thing, although I did want to
verify that I can build and run tests in dev properly.
How do I find my project in 'pu' and properly create a tracking branch
that I can use to update it?
jay
________________________________________________________________
erlang-patches (at) erlang.org mailing list.
See http://www.erlang.org/faq.html
To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
Post received from mailinglist |
|
|
| Back to top |
|
| t |
| Posted: Sat Jul 10, 2010 10:38 am |
|
|
|
User
Joined: 30 Sep 2008
Posts: 133
|
On Fri, Jul 9, 2010 at 9:31 PM, wrote:
> How do I find my project in 'pu' and properly create a tracking branch
> that I can use to update it?
Hi Jay,
have you tried using Bjorn's create-topic-branches Perl script?
It's documented here: http://wiki.github.com/erlang/otp/branches.
$ create-topic-branches upstream/dev..upstream/pu|grep 'jn/gen_stream'
git branch -f jn/gen_stream 2009b7a^2
$ create-topic-branches upstream/dev..upstream/pu|grep 'jn/gen_stream'|sh
$ git checkout jn/gen_stream
________________________________________________________________
erlang-patches (at) erlang.org mailing list.
See http://www.erlang.org/faq.html
To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
Post received from mailinglist |
|
|
| Back to top |
|
| t |
| Posted: Sat Jul 10, 2010 10:39 am |
|
|
|
User
Joined: 30 Sep 2008
Posts: 133
|
On Fri, Jul 9, 2010 at 9:31 PM, wrote:
> How do I find my project in 'pu' and properly create a tracking branch
> that I can use to update it?
Hi Jay,
have you tried using Bjorn's create-topic-branches Perl script?
It's documented here: http://wiki.github.com/erlang/otp/branches.
$ create-topic-branches upstream/dev..upstream/pu|grep 'jn/gen_stream'
git branch -f jn/gen_stream 2009b7a^2
$ create-topic-branches upstream/dev..upstream/pu|grep 'jn/gen_stream'|sh
$ git checkout jn/gen_stream
________________________________________________________________
erlang-patches (at) erlang.org mailing list.
See http://www.erlang.org/faq.html
To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
Post received from mailinglist |
|
|
| Back to top |
|
| Guest |
| Posted: Tue Jul 13, 2010 11:42 am |
|
|
|
Guest
|
On Fri, Jul 09, 2010 at 12:31:32PM -0700, jay@duomark.com wrote:
> I did a fresh synch with dev and tried to merge in the pu topic
> jn/gen_stream, but I can't seem to find it. I did the following.
>
> git pull upstream dev
> make
> make release_docs
> $ERL_TOP/bin/erl => R14B
> git push origin origin:refs/heads/gen_stream_track_test_procs
> git checkout --track -b gen_track_test_procs
>
> git log --oneline origin/pu | grep jn
>
> aaeb58c Merge branch 'jn/ic-docs-without-java' into pu
> 333d2b2 Merge branch 'jn/sasl-format_report' into ccase/r13b04_dev
> 61489dd Merge branch 'jn/supervisor_child_count_only' into ccase/r13b04_dev
>
>
> git branch -f jn/gen_stream 65f3db8^2
> fatal: Not a valid object name: '65f3db8^2'
>
>
> git branch -f jn/gen_stream 65f3db8
> fatal: Not a valid object name: '65f3db8'
>
> I guess starting from 'dev' was not a good thing, although I did want to
> verify that I can build and run tests in dev properly.
No, this was a good thing.
>
>
> How do I find my project in 'pu' and properly create a tracking branch
> that I can use to update it?
You should own the master branch. I should be tracking you.
Tuncer has hinted you about the 'create-topic-branches' script.
Here is a more low-level hint, "your" branch is as you figured out
parent number two (or 1, or the right, or ?) of the merge commit
you found and here is another way to dig it out. The way you did
it ought to work, but perhaps this fetch was missing:
$ git fetch upstream pu
$ git log --oneline --parents upstream/pu | grep jn
2009b7a 7ba2cc7 65f3db8 Merge branch 'jn/gen_stream' into pu
6d1a56d c0895d1 2016a08 Merge branch 'jn/ic-docs-without-java' into dev
333d2b2 ad8ff21 109a257 Merge branch 'jn/sasl-format_report' into ccase/r13b04_dev
61489dd aad8754 1686757 Merge branch 'jn/supervisor_child_count_only' into ccase/r13b04_dev
$ git show --name-only 65f3db8
commit 65f3db8de97410d3d683dbbc9419ba975232ad46
Author: Jay Nelson <jay@duomark.com>
Date: Mon May 17 02:06:59 2010 -0700
Add new gen_stream behaviour for efficiently consuming serial streams
Introduce a new behaviour for serially processing text files, generating
lazy or infinite streams or providing a serial interface for a binary.
Implement the behaviour functionality using a gen_server while internally
managing multiple processes to load the stream. Stripe stream data
across the worker processes to enable overlapped I/O when reading from
the source. Impose a simple API for consuming the stream serially, a block
at a time.
The initial arguments for the gen_stream specify the number of processes
used, the number of data chunks per process, the size of each chunk a
blocking factor for reading multiple chunks at a time and an optional
function parameter to transform the data while buffering it. The serial
stream delivers the (potentially transformed) data from the internal
process buffers as it is requested by the calling application.
lib/stdlib/doc/src/Makefile
lib/stdlib/doc/src/gen_stream.xml
lib/stdlib/doc/src/ref_man.xml
lib/stdlib/src/Makefile
lib/stdlib/src/gen_stream.erl
lib/stdlib/src/stdlib.app.src
lib/stdlib/test/Makefile
lib/stdlib/test/gen_stream_SUITE.erl
lib/stdlib/test/gen_stream_SUITE_data/alpha.txt
lib/stdlib/test/gen_stream_odd_nums.erl
$ git branch jn/gen_stream 65f3db8de97410d3d683dbbc9419ba975232ad46
$ git checkout jn/gen_stream
$ git rebase dev
>
> jay
>
>
>
> ________________________________________________________________
> erlang-patches (at) erlang.org mailing list.
> See http://www.erlang.org/faq.html
> To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
--
/ Raimo Niskanen, Erlang/OTP, Ericsson AB
________________________________________________________________
erlang-patches (at) erlang.org mailing list.
See http://www.erlang.org/faq.html
To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
Post received from mailinglist |
|
|
| Back to top |
|
| Guest |
| Posted: Tue Jul 13, 2010 11:43 am |
|
|
|
Guest
|
On Fri, Jul 09, 2010 at 12:31:32PM -0700, jay@duomark.com wrote:
> I did a fresh synch with dev and tried to merge in the pu topic
> jn/gen_stream, but I can't seem to find it. I did the following.
>
> git pull upstream dev
> make
> make release_docs
> $ERL_TOP/bin/erl => R14B
> git push origin origin:refs/heads/gen_stream_track_test_procs
> git checkout --track -b gen_track_test_procs
>
> git log --oneline origin/pu | grep jn
>
> aaeb58c Merge branch 'jn/ic-docs-without-java' into pu
> 333d2b2 Merge branch 'jn/sasl-format_report' into ccase/r13b04_dev
> 61489dd Merge branch 'jn/supervisor_child_count_only' into ccase/r13b04_dev
>
>
> git branch -f jn/gen_stream 65f3db8^2
> fatal: Not a valid object name: '65f3db8^2'
>
>
> git branch -f jn/gen_stream 65f3db8
> fatal: Not a valid object name: '65f3db8'
>
> I guess starting from 'dev' was not a good thing, although I did want to
> verify that I can build and run tests in dev properly.
No, this was a good thing.
>
>
> How do I find my project in 'pu' and properly create a tracking branch
> that I can use to update it?
You should own the master branch. I should be tracking you.
Tuncer has hinted you about the 'create-topic-branches' script.
Here is a more low-level hint, "your" branch is as you figured out
parent number two (or 1, or the right, or ?) of the merge commit
you found and here is another way to dig it out. The way you did
it ought to work, but perhaps this fetch was missing:
$ git fetch upstream pu
$ git log --oneline --parents upstream/pu | grep jn
2009b7a 7ba2cc7 65f3db8 Merge branch 'jn/gen_stream' into pu
6d1a56d c0895d1 2016a08 Merge branch 'jn/ic-docs-without-java' into dev
333d2b2 ad8ff21 109a257 Merge branch 'jn/sasl-format_report' into ccase/r13b04_dev
61489dd aad8754 1686757 Merge branch 'jn/supervisor_child_count_only' into ccase/r13b04_dev
$ git show --name-only 65f3db8
commit 65f3db8de97410d3d683dbbc9419ba975232ad46
Author: Jay Nelson <jay@duomark.com>
Date: Mon May 17 02:06:59 2010 -0700
Add new gen_stream behaviour for efficiently consuming serial streams
Introduce a new behaviour for serially processing text files, generating
lazy or infinite streams or providing a serial interface for a binary.
Implement the behaviour functionality using a gen_server while internally
managing multiple processes to load the stream. Stripe stream data
across the worker processes to enable overlapped I/O when reading from
the source. Impose a simple API for consuming the stream serially, a block
at a time.
The initial arguments for the gen_stream specify the number of processes
used, the number of data chunks per process, the size of each chunk a
blocking factor for reading multiple chunks at a time and an optional
function parameter to transform the data while buffering it. The serial
stream delivers the (potentially transformed) data from the internal
process buffers as it is requested by the calling application.
lib/stdlib/doc/src/Makefile
lib/stdlib/doc/src/gen_stream.xml
lib/stdlib/doc/src/ref_man.xml
lib/stdlib/src/Makefile
lib/stdlib/src/gen_stream.erl
lib/stdlib/src/stdlib.app.src
lib/stdlib/test/Makefile
lib/stdlib/test/gen_stream_SUITE.erl
lib/stdlib/test/gen_stream_SUITE_data/alpha.txt
lib/stdlib/test/gen_stream_odd_nums.erl
$ git branch jn/gen_stream 65f3db8de97410d3d683dbbc9419ba975232ad46
$ git checkout jn/gen_stream
$ git rebase dev
>
> jay
>
>
>
> ________________________________________________________________
> erlang-patches (at) erlang.org mailing list.
> See http://www.erlang.org/faq.html
> To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
--
/ Raimo Niskanen, Erlang/OTP, Ericsson AB
________________________________________________________________
erlang-patches (at) erlang.org mailing list.
See http://www.erlang.org/faq.html
To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
Post received from mailinglist |
|
|
| Back to top |
|
| Guest |
| Posted: Tue Jul 13, 2010 5:52 pm |
|
|
|
Guest
|
On Tue, Jul 13, 2010 at 09:57:34AM -0700, jay@duomark.com 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
________________________________________________________________
erlang-patches (at) erlang.org mailing list.
See http://www.erlang.org/faq.html
To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
Post received from mailinglist |
|
|
| Back to top |
|
| Guest |
| Posted: Tue Jul 13, 2010 5:52 pm |
|
|
|
Guest
|
On Tue, Jul 13, 2010 at 09:57:34AM -0700, jay@duomark.com 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
________________________________________________________________
erlang-patches (at) erlang.org mailing list.
See http://www.erlang.org/faq.html
To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
Post received from mailinglist |
|
|
| Back to top |
|
|
|
All times are GMT
|
|
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
You cannot attach files in this forum
You cannot download files in this forum
|
|
|
Digg It
Del.icio.us
Reddit
Facebook
Stumble Upon
Technorati
