[11:38:24 CDT(-0500)] <athena1> ok, stats portlet is in
[11:38:32 CDT(-0500)] <EricDalquist> yay!
[11:38:35 CDT(-0500)] <EricDalquist> I'll take a look tonight
[11:54:55 CDT(-0500)] <athena1> excellent 
[15:31:07 CDT(-0500)] <athena1> EricDalquist: what's the best way to make sure 4.0.x has all the relevant 4.1.x fixes?
[15:31:19 CDT(-0500)] <athena1> can i just cherry-pick a commit into th e4.0 branch, then commit?
[15:31:26 CDT(-0500)] <EricDalquist> yup
[15:31:29 CDT(-0500)] <EricDalquist> cherry pick does the commit
[15:31:30 CDT(-0500)] <athena1> excellent
[15:31:33 CDT(-0500)] <EricDalquist> unless there is a conflicty
[15:31:36 CDT(-0500)] <EricDalquist> so commit on master
[15:31:44 CDT(-0500)] <EricDalquist> cherry-pick into 4.0
[15:31:45 CDT(-0500)] <EricDalquist> and push
[15:31:52 CDT(-0500)] <athena1> and i can probably use the log tool to report stuff in 4.1 that's not in 4.0?
[15:32:01 CDT(-0500)] <EricDalquist> yeah
[15:32:05 CDT(-0500)] <athena1> excellent
[15:56:03 CDT(-0500)] <athena1> hm
[15:56:10 CDT(-0500)] <athena1> i don't think i have the right log command
[15:56:12 CDT(-0500)] <athena1> was trying
[15:56:27 CDT(-0500)] <athena1> git log upstream/master ^upstream/rel-4-0-patches
[15:56:37 CDT(-0500)] <athena1> but that seems to report things that have been cherry-picked back in
[15:56:52 CDT(-0500)] <EricDalquist> hrm
[15:57:15 CDT(-0500)] <EricDalquist> git cherry A B
[15:57:16 CDT(-0500)] <EricDalquist> I think
[15:58:13 CDT(-0500)] <athena1> tada!
[15:58:16 CDT(-0500)] <EricDalquist> git cherry -v rel-4-0-patches master
[15:58:19 CDT(-0500)] <EricDalquist> there we go
[15:58:28 CDT(-0500)] <EricDalquist> that shows commits on master but not on 4.0-patches
[15:58:29 CDT(-0500)] <EricDalquist> also
[15:58:30 CDT(-0500)] <EricDalquist> git is magic
[15:58:36 CDT(-0500)] <athena1> no kidding
[15:58:43 CDT(-0500)] <EricDalquist> like that one command
[15:58:46 CDT(-0500)] <EricDalquist> saves hours of work
[15:58:54 CDT(-0500)] <athena1> no kidding!
[16:01:35 CDT(-0500)] <athena1> git cherry v rel-4-0-patches master | grep ^
[16:01:50 CDT(-0500)] <athena1> all the ones starting w/ a + have already been applied, i guess
[16:01:59 CDT(-0500)] <EricDalquist> ahhh
[16:02:01 CDT(-0500)] <EricDalquist> even more magic
[16:02:08 CDT(-0500)] <athena1> or actually, the opposite
[16:02:09 CDT(-0500)] <athena1>
[16:02:20 CDT(-0500)] <athena1> but yeah
[16:02:26 CDT(-0500)] <athena1> wish we could easily filter by person