<HTML><HEAD></HEAD>
<BODY dir=ltr>
<DIV dir=ltr>
<DIV style="FONT-SIZE: 12pt; FONT-FAMILY: 'Calibri'; COLOR: #000000">
<DIV>One thing I didn’t say is that I expect my personal master, both local and
in origin, always to be identical to upstream master. I always create a
personal branch in local and origin for development and don’t develop on my
master. I then rebase that branch before any PR.</DIV>
<DIV> </DIV>
<DIV>I have a bunch of old PRs that are now pretty out of sync. I was
thinking of doing what you describe, isolate the code changes and put them into
a new branch off master. Probably there are ways to do this with
patches.</DIV>
<DIV> </DIV>
<DIV>My (windows) scripts are</DIV>
<DIV> </DIV>
<DIV>to sync master</DIV>
<DIV> </DIV>
<DIV>cd \gitroot\xsce</DIV>
<DIV>git checkout master</DIV>
<DIV>git fetch -u --all</DIV>
<DIV>git rebase upstream/master</DIV>
<DIV>git push origin master</DIV>
<DIV>git checkout -</DIV>
<DIV> </DIV>
<DIV>At this point local and origin master should be identical to
upstream. So to rebase my current branch from synced master</DIV>
<DIV> </DIV>
<DIV>cd \gitroot\xsce</DIV>
<DIV>git rebase master</DIV>
<DIV> </DIV>
<DIV style="FONT-SIZE: 12pt; FONT-FAMILY: 'Calibri'; COLOR: #000000">Tim</DIV>
<DIV
style='FONT-SIZE: small; TEXT-DECORATION: none; FONT-FAMILY: "Calibri"; FONT-WEIGHT: normal; COLOR: #000000; FONT-STYLE: normal; DISPLAY: inline'>
<DIV style="FONT: 10pt tahoma">
<DIV> </DIV>
<DIV style="BACKGROUND: #f5f5f5">
<DIV style="font-color: black"><B>From:</B> <A title=georgejhunt@gmail.com
href="mailto:georgejhunt@gmail.com">George Hunt</A> </DIV>
<DIV><B>Sent:</B> Friday, June 13, 2014 5:46 AM</DIV>
<DIV><B>To:</B> <A title=tim@timmoody.com href="mailto:tim@timmoody.com">Tim
Moody</A> </DIV>
<DIV><B>Cc:</B> <A title=curtathompson@gmail.com
href="mailto:curtathompson@gmail.com">Curt Thompson</A> ; <A title=me@jvonau.ca
href="mailto:me@jvonau.ca">Jerry Vonau</A> ; <A
title=server-devel@lists.laptop.org
href="mailto:server-devel@lists.laptop.org">XS Devel</A> </DIV>
<DIV><B>Subject:</B> Re: [XSCE] Re: workflow</DIV></DIV></DIV>
<DIV> </DIV></DIV>
<DIV
style='FONT-SIZE: small; TEXT-DECORATION: none; FONT-FAMILY: "Calibri"; FONT-WEIGHT: normal; COLOR: #000000; FONT-STYLE: normal; DISPLAY: inline'>
<DIV dir=ltr>Ok, I agree. My history and flubs don't belong in our collective
history. I don't think rebasing my branch on an up to date master, gets rid of
all the mistakes I made during role development.
<DIV> </DIV>
<DIV>But a thing I can try is to copy off a completed role (but not the hidden
git index) to a place outside the local git repo, make a new branch off of
master and check it out. Then copy back in the completed role, commit, and then
create the PR on the new branch. All the real (painful) history goes away when I
delete the old branch.</DIV></DIV>
<DIV class=gmail_extra><BR><BR>
<DIV class=gmail_quote>On Thu, Jun 12, 2014 at 11:30 PM, Tim Moody <SPAN
dir=ltr><<A href="mailto:tim@timmoody.com"
target=_blank>tim@timmoody.com</A>></SPAN> wrote:<BR>
<BLOCKQUOTE class=gmail_quote
style="PADDING-LEFT: 1ex; MARGIN: 0px 0px 0px 0.8ex; BORDER-LEFT: #ccc 1px solid">
<DIV dir=ltr>
<DIV dir=ltr>
<DIV style="FONT-SIZE: 12pt; FONT-FAMILY: 'Calibri'; COLOR: #000000">
<DIV>My impression is that PRs are always against a branch on our personal
repos. They are public in the sense that anyone can read them, but
private in that only we can write to them. Private repos for both read
and write cost money. So the link I put in the agenda was just what the
eventual PR will be.</DIV>
<DIV> </DIV>
<DIV>I raised the problem with history back when we all agreed to rebase our
person branches before creating PRs. But I am now convinced that it is
the only way to go as otherwise things can get very messy. Basically
rebasing guarantees that our personal changes are placed after the commits to
master in the upstream repo. I am also less interested in the commit
history because we have way too much of it and seldom go back to it.</DIV>
<DIV> </DIV>
<DIV style="FONT-SIZE: 12pt; FONT-FAMILY: 'Calibri'; COLOR: #000000">Tim</DIV>
<DIV
style='FONT-SIZE: small; TEXT-DECORATION: none; FONT-FAMILY: "Calibri"; FONT-WEIGHT: normal; COLOR: #000000; FONT-STYLE: normal; DISPLAY: inline'>
<DIV style="FONT: 10pt tahoma">
<DIV> </DIV>
<DIV style="BACKGROUND: #f5f5f5">
<DIV><B>From:</B> <A title=georgejhunt@gmail.com
href="mailto:georgejhunt@gmail.com" target=_blank>George Hunt</A> </DIV>
<DIV><B>Sent:</B> Thursday, June 12, 2014 9:25 PM</DIV>
<DIV><B>To:</B> <A title=tim@timmoody.com href="mailto:tim@timmoody.com"
target=_blank>Tim Moody</A> ; <A title=curtathompson@gmail.com
href="mailto:curtathompson@gmail.com" target=_blank>Curt Thompson</A> ; <A
title=me@jvonau.ca href="mailto:me@jvonau.ca" target=_blank>Jerry Vonau</A>
</DIV>
<DIV><B>Cc:</B> <A title=xsce-devel@googlegroups.com
href="mailto:xsce-devel@googlegroups.com" target=_blank>xsce-devel</A> </DIV>
<DIV><B>Subject:</B> workflow</DIV></DIV></DIV>
<DIV> </DIV></DIV>
<DIV>
<DIV class=h5>
<DIV
style='FONT-SIZE: small; TEXT-DECORATION: none; FONT-FAMILY: "Calibri"; FONT-WEIGHT: normal; COLOR: #000000; FONT-STYLE: normal; DISPLAY: inline'>
<DIV dir=ltr>I bought a book about git.
<DIV> </DIV>
<DIV>I'm particularly interested in prettying up my commit history. I've
been using my github account to move code I edit on my laptop to my test xo,
and 2/3 of the changes are fixing logic errors or typos.</DIV>
<DIV> </DIV>
<DIV>I read that one should not rebase (and thereby edit the history) if
anyone else is likely to (want to) pull or push to the public repo.</DIV>
<DIV> </DIV>
<DIV>I noticed that Tim pointed people to his personal repo for testing his
reorganization in the google doc this morning.</DIV>
<DIV> </DIV>
<DIV>My question: Is our personal clone of xsce on github public or
private?</DIV>
<DIV> </DIV>
<DIV>I think we can go either way. But I think it would be better if we
agreed, and knew more than I do about the implications of either
choice.</DIV></DIV></DIV></DIV></DIV></DIV></DIV></DIV></BLOCKQUOTE></DIV>
<DIV> </DIV></DIV></DIV></DIV></DIV></BODY></HTML>