James <pkx1...@runbox.com> writes: > Hello, > > On 27/07/2019 10:10, David Kastrup wrote: >> James <pkx1...@runbox.com> writes: >> >>> On 26/07/2019 19:36, David Kastrup wrote: >>>> ... >>>> I run Patchy when I notice something went to staging. Due to its cost, >>>> I tend to abort it when I discover someone else pushing before me. >>>> >>>> So it would appear that your repository (and probably that of Knut) have >>>> a local master branch which would mask that the patch in question does >>>> not produce output relative to the origin repository and thus produces >>>> stuff that is not reducible. A local master branch tends to be a bad >>>> idea (though not as bad as a local staging branch) since you don't want >>>> to collect changes of your own on it. >>> However the patchy scripts set up a local master >>> >>> e.g. If I manually delete my local master and then run the patchy scripts: >>> >>>> Branch 'master' set up to track remote branch 'master' from 'origin'. >>>> Switched to a new branch 'master' >>> (or is that not what you are talking about?) >> It is, but that does not happen in my repository when running >> lilypond-patchy-staging.py . Since there is no point in maintaining a >> local master potentially differing from upstream in the testing scripts, >> I wonder what script would be responsible here. > > I don't think it is any script per se, I used to use Lily-git (which > fetches master and staging and sets up dev/local_working. > > So I've always had a local master. > > Also, I test patches against current master (not staging) so I'd need > a local master then too right? > > i.e > > checkout master, run make, make test-basline, apply patch etc etc.
You don't need a local master for that. checkout origin or checkout origin/master does not create a local branch but just works from an ephemeral commit. > I don't run a script to test patches - the script 'broke' when we > moved from Google to Sourceforge, so I just test patches 'manually' > (out of tree) but I do make sure my local master is reset 'hard' (so > to speak) before I test things. You'll need to reset the work directory in any case (but a new checkout should cater for that), but branch maintenance is not really necessary. -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
