uPortal IRC Logs-2010-07-16

Owned by Apereo Infrastructure
Last updated: Jul 16, 2010Version comment

[02:02:01 CDT(-0500)] * lfuller (~sparhk@ip68-98-56-21.ph.ph.cox.net) has joined ##uportal
[07:48:09 CDT(-0500)] * colinclark (~colin@bas2-toronto09-1176444357.dsl.bell.ca) has joined ##uportal
[08:29:40 CDT(-0500)] * michelled (~michelled@142.150.154.141) has joined ##uportal
[08:47:24 CDT(-0500)] * colinclark_ (~colin@bas2-toronto09-1176444357.dsl.bell.ca) has joined ##uportal
[08:54:24 CDT(-0500)] * EricDalquist (~dalquist@2607:f388:e:0:221:9bff:fe37:e768) has joined ##uportal
[09:45:15 CDT(-0500)] * holdorph (~holdorph@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[09:53:32 CDT(-0500)] * bsparks (~bsparks@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[10:13:00 CDT(-0500)] * JoeMoore (89d88117@gateway/web/freenode/ip.137.216.129.23) has joined ##uportal
[11:55:41 CDT(-0500)] * bsparks1 (~bsparks@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[12:00:01 CDT(-0500)] * athena (~athena@c-76-121-97-221.hsd1.wa.comcast.net) has joined ##uportal
[12:21:48 CDT(-0500)] <athena> is an svn-generated patch capable of adding files in addition to modifying them?
[12:25:26 CDT(-0500)] <athena> oh ugh, never mind . . .
[12:53:51 CDT(-0500)] <EricDalquist> yes
[12:53:53 CDT(-0500)] <EricDalquist> and deleting them
[13:04:30 CDT(-0500)] <EricDalquist> athena: any ideas on https://issues.jasig.org/browse/UP-2711
[13:04:47 CDT(-0500)] <EricDalquist> I'm more than happy to hack code to get it fixed
[13:04:58 CDT(-0500)] <athena> think that's already fixed in at least the trunk
[13:05:10 CDT(-0500)] <EricDalquist> ah
[13:05:15 CDT(-0500)] <EricDalquist> was it a CPD change?
[13:05:43 CDT(-0500)] <athena> yeah
[13:05:49 CDT(-0500)] <EricDalquist> ok
[13:05:53 CDT(-0500)] <EricDalquist> I'll check if it was merged
[13:05:58 CDT(-0500)] <athena> thanks
[13:06:16 CDT(-0500)] <EricDalquist> yay for a functioning Source tab in Jira!
[13:06:57 CDT(-0500)] * michelled (~michelled@142.150.154.141) has joined ##uportal
[13:06:58 CDT(-0500)] <athena> (smile)
[13:07:24 CDT(-0500)] <athena> so w/ the svn patch what happened is i did a merge of the revision from the trunk onto my 3.2 working directory
[13:07:30 CDT(-0500)] <athena> then made some modifications to make it work in 3.2
[13:07:33 CDT(-0500)] <athena> and then generated a patch
[13:08:01 CDT(-0500)] <athena> the patch only has the modifications from the files copied from the trunk, not the whole files for the new code (sad)
[13:08:25 CDT(-0500)] <EricDalquist> have they been added with 'svn add'?
[13:08:43 CDT(-0500)] <EricDalquist> like if you do a 'svn status -you' if they show up with a ? they won't be included
[13:08:48 CDT(-0500)] <EricDalquist> since they haven't been 'added' yet
[13:08:57 CDT(-0500)] <EricDalquist> -u
[13:09:02 CDT(-0500)] <EricDalquist> stupid autocomplete
[13:09:03 CDT(-0500)] <athena> yes, they were marked for addtion
[13:09:08 CDT(-0500)] <EricDalquist> hrm
[13:09:27 CDT(-0500)] <athena> yeah.
[13:09:45 CDT(-0500)] <EricDalquist> so you did a '
[13:09:49 CDT(-0500)] <EricDalquist> 'svn diff'
[13:10:03 CDT(-0500)] <athena> yeah
[13:10:41 CDT(-0500)] <EricDalquist> weird
[13:10:46 CDT(-0500)] <EricDalquist> is this in an Eclipse project?
[13:11:02 CDT(-0500)] <athena> same problem w/ both the eclipse patch and the manual svn diff patch
[13:11:17 CDT(-0500)] <EricDalquist> very weird
[13:11:30 CDT(-0500)] <EricDalquist> I've only seen that if the new files weren't added
[13:12:14 CDT(-0500)] <athena> yeah, me too
[13:12:31 CDT(-0500)] <athena> wondering if somehow it still has the new files somehow associated w/ the trunk or something
[13:12:53 CDT(-0500)] <EricDalquist> yeah
[13:13:01 CDT(-0500)] <EricDalquist> you did that with a svn merge?
[13:13:10 CDT(-0500)] <athena> i think so
[13:13:31 CDT(-0500)] <athena> right now trying to manually copy the new files over to a clean 3.2 checkout w/ no history, then apply the patch i have
[13:13:45 CDT(-0500)] <athena> hopefully that'll apply the diff versus the trunk version to those
[13:13:46 CDT(-0500)] <athena> we'll see
[13:15:06 CDT(-0500)] <athena> looks like that might work
[13:31:22 CDT(-0500)] <athena> yeah, think that did it
[13:31:49 CDT(-0500)] <athena> so i guess i should have generated a patch from the trunk and applied it rather than doing a merge
[13:31:50 CDT(-0500)] <EricDalquist> yay]
[13:33:18 CDT(-0500)] <athena> oh, lessons learned the hard way (tongue)
[13:37:03 CDT(-0500)] * bsparks (~bsparks@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[14:02:30 CDT(-0500)] <EricDalquist> athena: https://issues.jasig.org/browse/UP-2712 should that go to you or gary?
[14:02:55 CDT(-0500)] <athena> me, probably
[14:03:23 CDT(-0500)] <EricDalquist> ok
[22:41:26 CDT(-0500)] * Naenyn (~Naenyn@ip24-56-44-93.ph.ph.cox.net) has joined ##uportal