[12:36:25 CDT(-0500)] <b-sure> hello uPortal devs. Did EricDalquist happen to see this import error I posted from yesterday? http://pastebin.com/raw.php?i=A7JJyQxQ not sure if you plan to make anymore adjustments to import/export.
[12:37:49 CDT(-0500)] <EricDalquist> I did
[12:37:55 CDT(-0500)] <EricDalquist> no idea if it is realated to the pending fixes
[12:37:59 CDT(-0500)] <EricDalquist> and the fixes are still pending
[12:38:07 CDT(-0500)] <EricDalquist> I'm porting over the 3.2 export fixes right now
[12:38:21 CDT(-0500)] <EricDalquist> I'll be working on the 4.0 changes once I'm done with 3.2
[12:39:18 CDT(-0500)] <b-sure> awesome. I'll be anxiously volunteering to test them when they're out there 
[14:57:52 CDT(-0500)] <EricDalquist> b-sure: https://github.com/jasig/uPortal/commit/9546674d1f86d8b5e9632821cb9f07ac5aaf4449
[14:58:02 CDT(-0500)] <EricDalquist> that is the set of changes we made in 3.2 to fix issues when exporting
[14:58:58 CDT(-0500)] <b-sure> thanks EricDalquist. I'll try to apply those to our 3.2 build in the morning. got mtgs the rest of the afternoon.
[15:01:41 CDT(-0500)] <b-sure> So EricDalquist. to use these changes, I would fetch from upstream and merge to my local master, then swtich to the 3-2-patches branch and do the build?
[15:02:06 CDT(-0500)] <EricDalquist> master is the main development branch for uPortal
[15:02:12 CDT(-0500)] <EricDalquist> which is 4.0.x right now
[15:02:36 CDT(-0500)] <EricDalquist> if you just want to use the latest 3.2 code
[15:03:09 CDT(-0500)] <EricDalquist> you could do:
[15:03:09 CDT(-0500)] <EricDalquist> git fetch upstream
[15:03:09 CDT(-0500)] <EricDalquist> git checkout rel-3-2-patches
[15:03:09 CDT(-0500)] <EricDalquist> git merge upstream/rel-3-2-patches
[15:03:17 CDT(-0500)] <EricDalquist> that would get you the rel-3-2-patches with the latest code on it
[15:03:38 CDT(-0500)] <EricDalquist> if you have a local branch of rel-3-2-patches which your 3.2 install is based on you would then do
[15:03:48 CDT(-0500)] <EricDalquist> git checkout your-3-2-branch
[15:03:53 CDT(-0500)] <EricDalquist> git merge rel-3-2-patches
[15:04:04 CDT(-0500)] <EricDalquist> which would merge the latest changes from the rel-3-2-patches branch into your branch