Re: LILY-GIT PITA

[Phil Holmes]

----- Original Message ----- 
From: "James" <address@hidden>
To: "Devel" <address@hidden>
Sent: Wednesday, November 27, 2013 9:05 PM
Subject: LILY-GIT PITA


> Hello,
>
> Am i the only one using lily-git.tcl of the *active* dev team?
>
> I ask because since it was changed a couple of years or so ago that it 
> *always* assumes you want/need to be on dev/local_working it really makes 
> it a PITA for me to work with. I've been trying to make a simple patch 
> this evening to a separate branch stable/2.18 for one minor tely file and 
> I then forget that I can then no longer just make 3 clicks and patch, no 
> matter where I am.
>
> I have do some stuff I have no idea how to do to merge or rebase or branch 
> or some such stuff just to get a patch formed.
>
> I've managed to screw up my LILYPOND_GIT dir twice now - headless with 
> merge conflicts on a load of files I have not even any interest in. It's 
> wasted time (and it is a wasted because I have learned nothing doing this) 
> and end up restoring my *whole LilyDev VM* just to get a clean set of 
> trees. Yes I can just download the source only but then I have to screw 
> about with my git config and ssh and all that jazz and it's just easier to 
> restore a VM from a backup frankly and then pull.
>
> If I am the only one using this tcl utility - and I think I am.
>
> Can someone just put it back so that it can create a patch and amend 
> existing commit based on the branch I am on *now* not what it thinks I 
> should be on?
>
> It really has put me off making any more doc contributions because I end 
> up having to relearn all the git cli each time as I don't live and breathe 
> git and the instructions in the CG assume some broad knowledge that I 
> don't have. It's become a game of luck as to whether I end up with a patch 
> or a borked tree.
>
> I don't develop separate branches and those that are skilled enough to do 
> that don't use Lily-git.tcl.

I used to be a big lily-git user, but now rarely do.  That's not because I 
found it messed me about, but because I learnt enough not to need it.  I've 
learnt the git commit syntax and the git patch syntax (generally git 
format-patch origin/master, iirc) well enough not to need it.  So if there 
are problems with it, they don't hit me, I'm afraid.  I also find gitk is my 
friend.

--
Phil Holmes