On 2008/06/20, Rune Zedeler wrote:
> Unfortunately I ofcourse cannot push onto origin - (error: remote
> 'refs/heads/dev/rune' is not a strict subset of local ref
> 'refs/heads/dev/rune'.)
>
> Should I "push -f" ?
IIRC this is not allowed on git.sv.gnu.org. If you really want to do
this (it se
Rune Zedeler skrev:
$ git rebase -i --onto remotes/dev/rune2 HEAD~15
Sorry for the noise, my git is too old (1.5.2.5).
It worked with rebase -v - now my dev/rune actually looks perfect - the
merge gone and all :) Thanks for helping!
Unfortunately I ofcourse cannot push onto origin - (er
Rune Zedeler skrev:
$ git branch dev/rune2 HEAD~6
whoops, should be HEAD~5^2
Well, it gives the same error.
-Rune
___
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
Johannes Schindelin skrev:
Hmm, perhaps the best thing is to branch off a new branch (dev/rune2)
just before the merge, and then cherry-pick the commits I did after the
revert...?
This would be a rebase.
Basically, you have to find out what the relationship is between the two
branches you ar
Hi,
On Fri, 20 Jun 2008, Rune Zedeler wrote:
> Valentin Villenave skrev:
> > Yes, AFAICR I did it all by the book. Mainline is the branch you want
> > to come back to, I think.
>
> Ok, in that case I see no point in reverting and trying again.
> The result should be the same.
>
> Hmm, perhaps t
Valentin Villenave skrev:
Yes, AFAICR I did it all by the book. Mainline is the branch you want
to come back to, I think.
Ok, in that case I see no point in reverting and trying again.
The result should be the same.
Hmm, perhaps the best thing is to branch off a new branch (dev/rune2)
just bef
2008/6/20 Rune Zedeler <[EMAIL PROTECTED]>:
> How did you revert?
There's only one way to revert a merge if IIRC...
> Did you specify a mainline ("git revert --mainline 1" or "git revert
> --mainline 2") ?
> I do not understand what the mainline argument is doing, but it appears that
> it should
Valentin Villenave skrev:
As it has been 9 months since i branched off dev/rune I tried to merge
master into dev/rune to test how it went.
And then I was flooded with conflicts.
I must be the one to blame here (even though I don't know why).
How did you revert?
Did you specify a mainline (
Op vrijdag 20 juni 2008, schreef Han-Wen Nienhuys:
> This is an excellent idea. However, did you test this? AFAIK, the
> decorator needs to accept the function as input argument.
I tested it and it worked, I even verified that it really builds the same
conversions list. :)
The function rule() re
This is an excellent idea. However, did you test this? AFAIK, the
decorator needs to accept the function as input argument.
On Fri, Jun 20, 2008 at 2:59 PM, Wilbert Berendsen <[EMAIL PROTECTED]> wrote:
> Hi,
>
> just for fun I rewrote convertrules.py (of current git) so that it uses a
> simple dec
Hi,
just for fun I rewrote convertrules.py (of current git) so that it uses a
simple decorator function. Instead of the double procedure (function, and
then calling conversions.append()) :
def conv(str)
# manipulate str
return str
conversions.append((version, conv, message))
you can n
2008/6/17 John Mandereau <[EMAIL PROTECTED]>:
> all @lsr and
> @lsrdir links in HTML docs are broken, I only had time to fix those in
> French docs. Could you please fix them (replace them with appropriate
> @rlsr in @seealso section) in German docs as your next contribution to
> LilyPond?
I've a
2008/6/20 Rune Zedeler <[EMAIL PROTECTED]>:
> As it has been 9 months since i branched off dev/rune I tried to merge
> master into dev/rune to test how it went.
> And then I was flooded with conflicts.
I must be the one to blame here (even though I don't know why).
When I merged your branch seve
> -Original Message-
> From: Han-Wen Nienhuys [mailto:[EMAIL PROTECTED]
> Sent: Thursday, June 19, 2008 9:19 AM
> To: Carl D. Sorensen
> Cc: lilypond-devel
> Subject: Re: csorensen fork of lilypond
>
>
> looks good in principle, but don't use i for strings,
>
> for prop in props:
>
> is
14 matches
Mail list logo
