Not really. http://pike.ida.liu.se/development/git/rw-git.xml ought to
describe how to set it up for rebasing.
I could write a few words about it there, if someone fixes me up with
an account on the Roxen server. Either I don't have one, or I've no
idea what the password could be.
- Original Message
> From: "Martin Stjernholm, Roxen IS @ Pike developers forum"
><10...@lyskom.lysator.liu.se>
> To: pike-devel@lists.lysator.liu.se
> Sent: Sun, September 11, 2011 3:05:03 PM
> Subject: Re: Val.true and Val.false [Was: XMLRPC] (from p...@roxen.com)
>
> Hmm, on seco
Hmm, on second thought, I suspect your problem is that you merge
instead of rebase on "git pull". Check that you've got the rebase flag
set to true, i.e. your .git/config should contain something like this:
[branch "7.9"]
remote = origin
merge = refs/heads/7.9
rebas
Yes, looks ok now. Good. :)
> Since re-cloning 7.9 my commits are going fine. I don't know when it
> got off, but it seems to be good now, thanks.
Recloning sounds overly brutal, but I can't say what's happened in
your case. If it's the usual problem with that the branch head has
moved on the ser
- Original Message
> From: "Martin Stjernholm, Roxen IS @ Pike developers forum"
><10...@lyskom.lysator.liu.se>
> To: pike-devel@lists.lysator.liu.se
> Sent: Sun, September 11, 2011 2:00:16 PM
> Subject: Re: Val.true and Val.false [Was: XMLRPC] (from p...@roxen.com)
>
> > Actually,
- Original Message
> From: "Martin Stjernholm, Roxen IS @ Pike developers forum"
><10...@lyskom.lysator.liu.se>
> To: pike-devel@lists.lysator.liu.se
> Sent: Sun, September 11, 2011 2:00:16 PM
> Subject: Re: Val.true and Val.false [Was: XMLRPC] (from p...@roxen.com)
>
> > Actually,
Okay, I got it. I just recloned the repo and recommited. 7.8 and 7.9 should
have the patches in now.
> Actually, I don't think it is necessary that decode_call take the
> flag, because if you don't pass in any Val objects, then everything
> will be an int anyway. It currently isn't possible to encode boolean
> unless you use Val, so if you need to, you will need to use the new
> features.
Sounds
>remote: Commit 65a4850d0c0afba9b89ba4698b728c5224c3ee97 does not contain
>d0344c6c82231970df581550111574da60aa8a84 in its first-parent ancestry.
There's your error. d0344c6 is the current head of 7.9, but you are
trying to push something (65a4850) which is not a continuation from
that point. P
- Original Message
> From: "Martin Stjernholm, Roxen IS @ Pike developers forum"
><10...@lyskom.lysator.liu.se>
> To: pike-devel@lists.lysator.liu.se
> Sent: Sun, September 11, 2011 12:45:02 PM
> Subject: Re: Val.true and Val.false [Was: XMLRPC] (from p...@roxen.com)
>
> Thanks for
- Original Message
> From: "Martin Stjernholm, Roxen IS @ Pike developers forum"
><10...@lyskom.lysator.liu.se>
> To: pike-devel@lists.lysator.liu.se
> Sent: Sun, September 11, 2011 12:45:02 PM
> Subject: Re: Val.true and Val.false [Was: XMLRPC] (from p...@roxen.com)
>
> Thanks for
Thanks for the effort, but it still needs some fixing:
The compat flag is the wrong way. The point with compat is that old
code should continue to work without changes. With this patch it's
still necessary to change some calls to get the old behavior back. (If
you don't like the flag in new code t
12 matches
Mail list logo
