Ouch .. I even tested by sending a message to myself and it looked okay. I
created a JIRA for this:
https://issues.apache.org/jira/browse/QUARKS-15
and attached a text file that lists the steps below. In a way this might be a
good way to do it. That way as we move along we can update that document.
Susan
From: "[email protected]" <[email protected]>
To: "[email protected]" <[email protected]>
Sent: Tuesday, March 8, 2016 5:02 PM
Subject: Re: Fw: Process for committing files
Yep, I sure can, just saw that .. sorry about that. Please let me know how
this one looks:
Hi, All,I went ahead with another commit / pull. Here is what I did. Not sure
if everyone agrees on this, but it worked for me:
For my initial clone and setting up of my configuration stuffgit clone
https://[email protected]/repos/asf/incubator-quarks.gitgit config
user.name "Susan L. Cline"git config user.email [email protected]
Since I'm on MacOSX:git config --global credential.helper osxkeychaingit config
--global core.autocrlf inputAdd upstream ....git remote add upstream
https://[email protected]/repos/asf/incubator-quarks.gitgit checkout
mastergit fetch upstreamgit rebase upstream/mastergit pushgit checkout -b
"console_hover_text" <-- whatever the name of your branch is ...git add
console/servlets/src/main/java/quarks/console/servlets/ConsoleJobServlet.java
<-- add your file(s)git commit -m 'QUARKS-6 updated objectname for
jobmxbean'git checkout mastergit fetch upstreamgit rebase upstream/mastergit
pushgit checkout console_hover_text <-- whatever your branch name is git rebase
mastergit diff <-- I just do this to make sure there are no conflictsgit push
--set-upstream origin console_hover_textNOW look for the commit notice, hang
out on the dev list to see if anyone has objections or wants to discuss the
commitIf not make the pull ...git checkout mastergit pull --rebasegit checkout
console_hover_text <-- your branchgit rebase mastergit checkout mastergit log
<-- this is the part I am not sure about, Luciano mentioned to check this .. I
don't really understand this. I don't see an entry here for this commitgit
merge console_hover_text <-- your branchgit push
Then after that you can do this to delete your branch:git checkout mastergit
branch --delete console_hover_text <-- your branchgit push origin --delete
console_hover_text <-- your branch
Please let me know if there is a better way.
Cheers,Susan
From: Katherine Marsden <[email protected]>
To: [email protected]
Sent: Tuesday, March 8, 2016 4:58 PM
Subject: Re: Fw: Process for committing files
On 3/8/2016 4:21 PM, [email protected] wrote:
> Hi, All,
> I went ahead with another commit / pull. Here is what I did. Not sure if
> everyone agrees on this, but it worked for me:
Thank you Susan for doing this. This is a really important email but the
lines seems to have gotten kind of run together at least in my
mailer. The previous emails on this thread were ok. Could you resend
with line breaks?
> For my initial clone and setting up of my configuration stuff
> git clone
> https://[email protected]/repos/asf/incubator-quarks.gitgit
> config user.name "Susan L. Cline"git config user.email [email protected]
> Since I'm on MacOSX:
> git config --global credential.helper osxkeychaingit config --global
> core.autocrlf input
> Add upstream ....git remote add upstream
> https://[email protected]/repos/asf/incubator-quarks.gitgit checkout
> mastergit fetch upstreamgit rebase upstream/mastergit pushgit checkout -b
> "console_hover_text" <-- whatever the name of your branch is ...git add
> console/servlets/src/main/java/quarks/console/servlets/ConsoleJobServlet.java
> <-- add your file(s)git commit -m 'QUARKS-6 updated objectname for
> jobmxbean'git checkout mastergit fetch upstreamgit rebase upstream/mastergit
> pushgit checkout console_hover_text <-- whatever your branch name is git
> rebase mastergit diff <-- I just do this to make sure there are no
> conflictsgit push --set-upstream origin console_hover_text
> NOW look for the commit notice, hang out on the dev list to see if anyone has
> objections or wants to discuss the commitIf not make the pull ...
> git checkout mastergit pull --rebasegit checkout console_hover_text <-- your
> branchgit rebase mastergit checkout mastergit log <-- this is the part I am
> not sure about, Luciano mentioned to check this .. I don't really understand
> this. I don't see an entry here for this commitgit merge console_hover_text
> <-- your branchgit push
> Then after that you can do this to delete your branch:
> git checkout mastergit branch --delete console_hover_text <-- your branchgit
> push origin --delete console_hover_text <-- your branch
> Please let me know if there is a better way.Cheers,Susan
>
> ----- Forwarded Message -----
> From: "[email protected]" <[email protected]>
> To: "[email protected]" <[email protected]>
> Sent: Tuesday, March 8, 2016 11:20 AM
> Subject: Re: Process for committing files
>
> I may have done this wrong ...
> I did 'git log' before I did a git merge and I did not see anything related
> to my earlier commit. So when you say do a git log, is that what I want?Not
> to see anything in there related to the commit?
> Here is this
> commit:http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/6ddf684a
>
> Is this the correct way so it can be seen in the graphical git tool?
> Susan
>
> From: Luciano Resende <[email protected]>
> To: [email protected]; [email protected]
> Cc: Dan Debrunner <[email protected]>
> Sent: Tuesday, March 8, 2016 11:00 AM
> Subject: Re: Process for committing files
>
>
>
> On Tue, Mar 8, 2016 at 10:35 AM, <[email protected]> wrote:
>
> I'm following what Luciano recommended, and I am at this point:
> I would not recommend merging when merge creates an empty commit. I would
> do something like :
>
> git checkout master <-- done
> git pull --rebase <-- done
> git checkout quarks-3 <-- done
> git rebase master <-- done
> git checkout master <-- done
>
> Now, here you can do two things <-- have not done that yet
> git merge quarks-3
> but make sure with git log or git k that you don't have a empty merge
> commit like this
> http://mail-archives.apache.org/mod_mbox/incubator-quarks-commits/201603.mbox/%3C075f51d86d934da5b327675955cf4e53%40git.apache.org%3E
> Can you explain what you mean by saying it has an empty merge? I don't see
> what you mean when I look at that link ? Thanks
>
> or you could also use
> git cherry-pick <commit hash>
>
> git push
>
>
>
>
> Let's take an example of QUARKS-7 fix.
> The actual fix was this commit, which you actually see the changes inside :
> http://mail-archives.apache.org/mod_mbox/incubator-quarks-commits/201603.mbox/%[email protected]%3E
>
> But, because merge was used, then you get an extra commit, where the title
> does not mean much (only says merge blah, blah, blah) and it also does not
> have any good context of the changes inside (e.g. diff)
> http://mail-archives.apache.org/mod_mbox/incubator-quarks-commits/201603.mbox/%[email protected]%3E
>
> If cherry-pick or rebase was used, this extra commit was not going to be
> present, and when viewed in a graphical git tool, you would see a linear code
> stream, instead of multiple branches going back and forth from master.
>
> Some other projects have these automated, with some advanced stuff such as
> automatically close of related jiras, etc...
> https://github.com/lresende/spark/blob/master/dev/merge_spark_pr.py
>
