Re: LILY-GIT PITA

[James]

Hello,

On 29/11/13 01:47, Carl Sorensen wrote:
> On 11/28/13 2:53 PM, "Janek Warchoł" <address@hidden> wrote:
>
> > Hi,
> >
> > 2013/11/28 Carl Sorensen <address@hidden>:
> > > On 11/28/13 3:33 AM, "David Kastrup" <address@hidden> wrote:
> > > > It
> > > > would appear that at the current point of time, just rowing back some
> > > > selected changes will already accomplish a lot.
> > > I actually don't believe that rowing back those changes will fix things.
> > > But if they do, I'm certainly willing to do it.
> > If you need help with this issue, let me know.
> I'm sure that I can do it in an hour or two at the most.  I just need more
> details on what James is trying to do, and what the problems are.  Then
> I'll get it fixed.
>
> Thanks,
>
> Carl

Thanks I appreciate the feedback.

I think Phil also has a similar work-flow to me but it goes something 
like this

1. Git checkout [branch] on the command line. That's fine I can handle 
that :)

Where [branch] is going to be Staging 99% of the time (but for the case 
where I whined, it was stable/2.18)

2. Then run lily-git.tcl from the same session which keeps me on the 
branch, and click the 'update source' button which I think does a pull 
or some-such thing.=

3. Then I make my edit to whatever tely file needs changing.

4. Then I would click the 'New local commit' button to pop up that UI 
that I write all the summary/details in it.

5. Then I would click the 'make patch set' button to get my patch.

5a: Run git-cl to upload patch set for review.

6. Then I would click the 'Abort Changes Reset to Origin' button which 
removes my commit (the patch still exists remember)

done.

I then work on the next item and have a new patch for that, aborting 
after I create that.



Now when I have had a review and need to edit my patch I would

i. Git checkout [branch] on the command line.

ii. Fire up lily-git.tcl and click the update source button (just to be 
sure I am on the most current version)

iii. Close lily-git and git am the patch.

iv. Make changes to the patched files and then click the 'Amend previous 
commit' button so I can then make a new patch set for the changes to the 
just-applied patch file.

v. Then I would click the 'make patch set' button to get my patch.

va: Run git-cl to upload patch set for review.

vi. Then I would click the 'Abort Changes Reset to Origin' button which 
removes my commit (the patch still exists remember)


So I think all that Lily-git needs to do is to just assume the branch I 
am on is the one I want to amend/create new commit/abort reset on.

I can also use gitk to hard reset to a specific earlier point (lose all 
my changes) and then run git pull in the cli.


heh.. I'm probably making a lot of the skilled git users flinch with my 
method.

But basically I am managing patches instead of branches and yes I am 
happy to keep 'rebasing' patches by applying them, amending the last 
commit and making a new patch set. It is clunky but it seems simple.

I hope that isn't too much work, but that the old way of lily-git seemed 
to work OK.

James