Re: Allow rb to use any io_device/registered name instead of only filename path
Siri Hansen <[email protected]>
| Newsgroups | gmane.comp.lang.erlang.patches |
|---|---|
| Message-ID | <CAGqERUEb2_EvpCqbjr-S_PR9EcMTWAgt7KdUFt6kUwzFAna3Jg@mail.gmail.com> |
Hi Eric - I am looking at this patch, and I find the diff a bit strange. I see in the first commit that you updated the documentation (rb.xml) for e.g. rb:start: e.g. - <v>FileName = string() | standard_io</v> + <v>FileName = string() | atom() | pid()</v> but this is backed out again in your second commit, although is seems the code is still there (and, as far as I can understand, this functionality is also the main point of the patch). Could you please have a look at it? Did something go wrong in a merge or rebase? Regards /siri 2013/6/18 PAILLEAU Eric <[email protected]> > _ > >> erlang-patches mailing list > >> [email protected] > >> http://erlang.org/mailman/listinfo/erlang-patches > > Hello Eric, > > We just stumbled across in your patch that you have merged maint into > > your patch, > > which you not should do. Do a rebase upon the latest maint branch on our > > github instead and notify us when done. > > Thanks, > > > Hello Fredrik, > > the first time you told me this, I though that I did a 'git merge', but > no... > The merge is done by the 'git push' after my commit, without any warning. > By googling a bit, I found I need to add : > git config --global --bool pull.rebase true > > or use > git rebase -i @{u} > before any push ... > > sorry for this, I'm using git only for otp and not a specialist ... > > I did a rebase, you can fetch now. > I hope it is ok for you now... > > regards > _______________________________________________ > erlang-patches mailing list > [email protected] > http://erlang.org/mailman/listinfo/erlang-patches > _______________________________________________ erlang-patches mailing list [email protected] http://erlang.org/mailman/listinfo/erlang-patches