uPortal IRC Logs-2013-01-30

Owned by Apereo Infrastructure
Last updated: Jan 30, 2013
2 min read

[16:11:51 CST(-0600)] <EricDalquist> hello cwaymire

[16:12:23 CST(-0600)] <EricDalquist> have you used git cherry-pick before/

[16:13:25 CST(-0600)] <cwaymire> I have not. what does it do?

[16:13:40 CST(-0600)] <EricDalquist> it moves the specific diff of the referenced commit into the current branch

[16:13:50 CST(-0600)] <EricDalquist> so that is how you would apply that change to rel-4-0-patches

[16:13:59 CST(-0600)] <EricDalquist> the sequence would be:

[16:14:07 CST(-0600)] <EricDalquist> git checkout rel-4-0-patches

[16:14:20 CST(-0600)] <EricDalquist> git merge upstream/rel-4-0-patches

[16:14:29 CST(-0600)] <EricDalquist> git cherry-pick SHAID

[16:14:40 CST(-0600)] <cwaymire> cool. I was just about to look up how git handles that.

[16:15:11 CST(-0600)] <EricDalquist> also one request, before merging a work branch that has been open for a while into master do a "git rebase master"

[16:15:34 CST(-0600)] <EricDalquist> that essentially moves your branch point to the latest commit on head and then replays the commits on the branch

[16:15:42 CST(-0600)] <EricDalquist> it keeps the commit history more linear

[16:16:01 CST(-0600)] <cwaymire> ok. will do.

[16:16:55 CST(-0600)] <EricDalquist> I'm working on pull 104 right now

[16:16:58 CST(-0600)] <EricDalquist> should have it merged tonight

[16:18:34 CST(-0600)] <cwaymire> awesome

[16:18:56 CST(-0600)] <EricDalquist> I'm tweaking the PortletLayoutAggregationDao a bit so at report time it only has to run a single query

[16:21:41 CST(-0600)] <cwaymire> cool. i'm sure that stuff can definitely use some tweaking. I got that task handed to me just prior to everyone taking holiday vacation so was left to my own devices for figuring out the existing code as well as adding in some new reports.

[16:21:50 CST(-0600)] <EricDalquist> lol

[16:21:52 CST(-0600)] <EricDalquist> no problem

[16:21:58 CST(-0600)] <EricDalquist> its like 95% there

[16:22:06 CST(-0600)] <EricDalquist> just figure I'd do this little bit while merging