lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: musicxml2ly: title and subtitle (issue 1913), miscellaneous (issue 5


From: ptrcklschmdt
Subject: Re: musicxml2ly: title and subtitle (issue 1913), miscellaneous (issue 5096050)
Date: Mon, 26 Sep 2011 20:45:37 +0000

On 2011/09/25 18:30:51, janek wrote:
2011/9/25  <address@hidden>:
> Hi Janek,
>
> I was talking about uploading some changes of this patch to
rietveld. I
> forgot to add some bits and pieces I had announced in the
description of
> this patch to the reworked version. I would have had to adjust only
2 of
> the 3 files in the patch. That's why I asked whether it's possible
to
> upload only these 2 changed files in a new patch, but probably
not...

It is possible.

> As I'm not really experienced with git I would have to redo the
whole
> patch.

That surely won't be necessary.
In fact, it'd be undesired also from our point of view.

> I use Lilydev and git. IIRC I had some problems with lily-git the
last
> time I used it, but I will give it another try...

If you are able to use git via command line, there's no point in
switching to lily-git :)  Lily-git is only an "easy" tool for people
that may have trouble with command line.

So, here is what you need to know about git in your current situation.
  For clarity i'll describe how everything is done from the very
beginning:
1) work begins by cloning git repository from official server to your
Lilydev
2) make changes in files inside working directory (i.e. files that
appear inside lilypond-git)
3) make a commit: 'git commit -a'
4) update your repository: 'git pull -r'
5) upload your patch to Rietveld: 'git cl upload origin/master'
    After this step the newly created Rietveld issue will show the
differencies between your local git repository (which contains your
patch, since you have committed it in step 3) and official "master"
repository.  There are differencies in 3 files.
This is the step you are in.
6) make the changes you forgot about to the files in working
directory, save those files
7) commit the changes: 'git commit -a -m "write your commit message
inside quotation marks" ' (you can also omit -m option and write
commit message in the editor that appears)
8) update your repository: 'git pull -r'
9) upload new version of the patch to Rietveld: 'git cl upload
origin/master'
    What exactly does this do?  First of all, it doesn't create a new
Rietveld issue, but updates the issue that already exists (that's
good).  It sends the difference between your local git repository and
official repository.  It doesn't matter that it was done as two
commits; the Rietveld tool will look at the diff send and think "there
is a difference in two files between what was previously uploaded and
the current state of things" and update these two files.  We will be
able to see everything - both newest versions of these two files and
your version of the third file (which is already uploaded) - when we
go to http://codereview.appspot.com/5096050/

I hope this makes things clear.  If you have any questions, ask!
Good luck,
Janek

Thanks!

http://codereview.appspot.com/5096050/



reply via email to

[Prev in Thread] Current Thread [Next in Thread]