Page Comparison

[00:53:04 EDT(-0400)] * esm (n=esm@207-53-193-206.dynamic-dsl.qis.net) has joined ##uportal
[07:54:27 EDT(-0400)] * esm (n=esm@207-53-193-206.dynamic-dsl.qis.net) has joined ##uportal
[09:07:09 EDT(-0400)] * esm (n=esm@128.220.212.115) has joined ##uportal
[09:14:21 EDT(-0400)] * michelled (n=team@142.150.154.197) has joined ##uportal
[09:35:31 EDT(-0400)] * EiNZTEiN (n=einztein@205.241.143.4) has joined ##uportal
[09:40:39 EDT(-0400)] * anastasiac (n=team@142.150.154.105) has joined ##uportal
[09:47:16 EDT(-0400)] * MarkRogers (n=MarkRoge@addhcp129.cc.umanitoba.ca) has joined ##uportal
[09:53:41 EDT(-0400)] * athena7 (n=athena7@lumina.its.yale.edu) has joined ##uportal
[10:00:22 EDT(-0400)] * EricDalquist (n=dalquist@bohemia.doit.wisc.edu) has joined ##uportal
[10:03:40 EDT(-0400)] * EiNZTEiN (n=einztein@205.241.143.4) has joined ##uportal
[10:22:45 EDT(-0400)] * colinclark (n=colin@142.150.154.101) has joined ##uportal
[10:41:31 EDT(-0400)] * athena7_ (n=athena7@tp-wireless.its.yale.edu) has joined ##uportal
[10:45:08 EDT(-0400)] * colinclark (n=colin@142.150.154.101) has joined ##uportal
[10:58:01 EDT(-0400)] <athena7> what's the best way to replace the trunk in subversion with a branch?
[11:02:27 EDT(-0400)] <EricDalquist> so you have a branch with dev in it
[11:02:32 EDT(-0400)] <EricDalquist> and you want that to 'become' the trunk?
[11:06:58 EDT(-0400)] <athena7> yeah
[11:07:22 EDT(-0400)] <athena7> i wasn't sure what the cleanest way to do that is
[11:07:25 EDT(-0400)] <EricDalquist> so if there are more changes in the branch than can easily be merged, and all of the changes in the trunk are in the branch
[11:07:41 EDT(-0400)] <EricDalquist> you can either move the trunk to a tag or delete it then move the branch to the trunk
[11:08:10 EDT(-0400)] <athena7> ok, yeah, it sounds like in this case we'd want to move to trunk to a branch, then move the branch to the trunk
[11:08:11 EDT(-0400)] <athena7> thanks
[11:08:20 EDT(-0400)] <EricDalquist> yup
[11:24:53 EDT(-0400)] <athena7> so i got xstream reading in the channel publishing documents
[11:26:46 EDT(-0400)] <EricDalquist> neat
[11:27:33 EDT(-0400)] <athena7> yeah i've been pretty happy with xstream so far
[11:27:36 EDT(-0400)] <athena7> it's pretty cool
[11:27:44 EDT(-0400)] <athena7> been playing with the annotations-based stuff
[11:31:40 EDT(-0400)] <EricDalquist> haven't tried the annotations stuff
[11:31:45 EDT(-0400)] <EricDalquist> but it is a very neat library
[11:35:24 EDT(-0400)] <EricDalquist> in the sandbox-up3 days we were looking at xstream to do what Drew did with cernunnos
[11:35:37 EDT(-0400)] <EricDalquist> just because it does xml to object binding so well
[11:50:57 EDT(-0400)] * holdorph (n=holdorph@wsip-98-174-242-39.ph.ph.cox.net) has joined ##uportal
[11:51:12 EDT(-0400)] <athena7> yeah that makes sense
[11:59:53 EDT(-0400)] <EricDalquist> welcome back from the conference everyone ... good to see a nice crowd in here
[12:05:54 EDT(-0400)] <MarkRogers> it was awesome!
[12:06:29 EDT(-0400)] <EricDalquist>
[12:06:42 EDT(-0400)] <holdorph> I'm still burnt
[12:06:57 EDT(-0400)] <EricDalquist> yeah
[12:07:06 EDT(-0400)] <EricDalquist> today is catch up on email and do expense report day
[12:07:09 EDT(-0400)] <holdorph> I need a day off. I got back on Saturday night, then had to do a big family get together all day yesterday
[12:07:25 EDT(-0400)] <EricDalquist> oh wow
[12:07:34 EDT(-0400)] <EricDalquist> yeah, a vacation would be good
[12:08:19 EDT(-0400)] <MarkRogers> have you put your pictures up anywhere, Cris?
[12:10:02 EDT(-0400)] <holdorph> yeah, i have a few pictures from Sunday/Monday reception on flickr here: http://www.flickr.com/photos/thirl/sets/72157604819636323/
[12:10:20 EDT(-0400)] <holdorph> this is the best shot of all though.
[12:10:21 EDT(-0400)] <holdorph> http://www.flickr.com/photos/thirl/2454772963/in/set-72157604819636323/
[12:13:10 EDT(-0400)] <athena7> that is pretty excellent
[12:33:16 EDT(-0400)] <athena7> i just committed a cached password user info service
[12:33:25 EDT(-0400)] <athena7> since we didn't seem to have that covered in up3
[12:33:47 EDT(-0400)] <EricDalquist> ah
[12:33:50 EDT(-0400)] <EricDalquist> good point
[12:33:52 EDT(-0400)] <EricDalquist> thanks
[12:33:55 EDT(-0400)] <athena7> no problem
[12:34:03 EDT(-0400)] <EricDalquist> can you merge it into the patches branch and the gaps branch?
[12:34:16 EDT(-0400)] <athena7> you're doing that with svn merge, right?
[12:34:24 EDT(-0400)] <athena7> i need to figure out how to use that
[12:34:35 EDT(-0400)] <EricDalquist> I am, but if you're not comfortable with that you can just commit it to those branches too
[12:34:45 EDT(-0400)] <EricDalquist> though I would be more than happy to answer svnmerge related questions
[12:34:48 EDT(-0400)] <athena7> eh i need to figure that out anyway
[12:34:53 EDT(-0400)] <athena7> i'll take a look at that later today
[12:35:01 EDT(-0400)] <EricDalquist> sounds good
[12:50:51 EDT(-0400)] * EiNZTEiN (n=einztein@205.241.143.4) has joined ##uportal
[14:14:52 EDT(-0400)] * EiNZTEiN (n=einztein@205.241.143.4) has joined ##uportal
[15:36:02 EDT(-0400)] * EricDalquist (n=dalquist@bohemia.doit.wisc.edu) has joined ##uportal
[16:32:33 EDT(-0400)] * holdorph (n=holdorph@wsip-98-174-242-39.ph.ph.cox.net) has joined ##uportal
[17:16:06 EDT(-0400)] <KWhat_Work> anyone get uportal loaded with eclipse
[17:18:17 EDT(-0400)] * athena7 (n=athena7@c-24-2-189-230.hsd1.ct.comcast.net) has joined ##uportal
[17:35:41 EDT(-0400)] * michelled (n=team@142.150.154.197) has left ##uportal