Page Comparison

[09:00:03 EST(-0500)] * EricDalquist (~dalquist@2607:f388:e:0:221:9bff:fe37:e768) has joined ##uportal
[09:06:35 EST(-0500)] * colinclark (~colin@bas2-toronto09-1176406027.dsl.bell.ca) has joined ##uportal
[09:10:23 EST(-0500)] <EricDalquist> woohoo! DBCP 1.4 is out
[09:10:27 EST(-0500)] <EricDalquist> http://commons.apache.org/dbcp/changes-report.html#a1.4
[09:17:14 EST(-0500)] * michelled (~michelled@142.150.154.101) has joined ##uportal
[09:18:06 EST(-0500)] * lfuller (~sparhk@ip68-98-56-21.ph.ph.cox.net) has left ##uportal
[10:05:04 EST(-0500)] * holdorph (~holdorph@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[10:07:23 EST(-0500)] * lfuller (~sparhk@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[10:21:03 EST(-0500)] * awills (~awills@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[10:28:02 EST(-0500)] * colinclark (~colin@142.150.154.101) has joined ##uportal
[10:48:00 EST(-0500)] * colinclark (~colin@142.150.154.101) has joined ##uportal
[10:51:24 EST(-0500)] * athena (~athena@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[11:10:22 EST(-0500)] * colinclark (~colin@142.150.154.101) has joined ##uportal
[11:34:52 EST(-0500)] * Sememmon (~Sememmon@unaffiliated/sememmon) has joined ##uportal
[11:45:46 EST(-0500)] * colinclark (~colin@142.150.154.101) has joined ##uportal
[12:25:54 EST(-0500)] * colinclark (~colin@142.150.154.101) has joined ##uportal
[12:42:51 EST(-0500)] * athena7 (~athena@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[12:55:10 EST(-0500)] <athena> hey EricDalquist, is the 3.2.x svn branch set up for svn merge?
[12:55:17 EST(-0500)] <EricDalquist> I think so
[12:56:57 EST(-0500)] <athena> huh
[12:56:59 EST(-0500)] <athena> getting svn: Attempting to delete nonexistent property 'svnmerge-blocked'
[12:57:05 EST(-0500)] <EricDalquist> maybe not then
[12:57:11 EST(-0500)] <EricDalquist> its easy to setup
[12:57:24 EST(-0500)] <EricDalquist> with a clean checkout of 3.2 you can do a svnmerge init
[12:58:13 EST(-0500)] * lfuller (~sparhk@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[13:02:12 EST(-0500)] * michelled (~michelled@142.150.154.101) has joined ##uportal
[13:02:22 EST(-0500)] * Sememmon (~Sememmon@unaffiliated/sememmon) has joined ##uportal
[13:02:27 EST(-0500)] * colinclark (~colin@142.150.154.101) has joined ##uportal
[13:08:41 EST(-0500)] * holdorph (~holdorph@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[13:21:08 EST(-0500)] <athena> is there anything else i have to do, or just run that?
[13:21:19 EST(-0500)] <EricDalquist> run that
[13:21:20 EST(-0500)] <EricDalquist> then a commit
[13:21:33 EST(-0500)] <athena> ok, i'll try that
[13:22:03 EST(-0500)] <athena> hm, guess it already has been
[13:23:07 EST(-0500)] <EricDalquist> oh
[13:23:14 EST(-0500)] <EricDalquist> probably because of the branching
[13:23:18 EST(-0500)] <EricDalquist> hrm
[13:24:36 EST(-0500)] <athena> we usually check stuff into trunk, then merge it into the branch, right?
[13:26:12 EST(-0500)] <EricDalquist> right
[13:26:36 EST(-0500)] <athena> hm, guess avail doesn't work either
[13:27:09 EST(-0500)] <EricDalquist> oh
[13:27:11 EST(-0500)] <EricDalquist> I bet I know
[13:27:17 EST(-0500)] <EricDalquist> the merge data probably needs to be removed
[13:27:21 EST(-0500)] <EricDalquist> then commit
[13:27:23 EST(-0500)] <EricDalquist> then re-add it
[13:37:51 EST(-0500)] * colinclark (~colin@142.150.154.101) has joined ##uportal
[13:51:00 EST(-0500)] * athena7 (~athena@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[14:41:42 EST(-0500)] * michelled (~michelled@142.150.154.101) has joined ##uportal
[15:19:35 EST(-0500)] * athena7 (~athena@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[15:55:05 EST(-0500)] * lfuller (~sparhk@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[15:56:19 EST(-0500)] * lfuller1 (~sparhk@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[15:57:49 EST(-0500)] * awills1 (~awills@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[15:58:50 EST(-0500)] <athena> ok EricDalquist
[15:59:03 EST(-0500)] <athena> is there a simple way to remove the merge data?
[15:59:26 EST(-0500)] * holdorph (~holdorph@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[16:01:38 EST(-0500)] <EricDalquist> uninit
[16:01:52 EST(-0500)] <EricDalquist> 'svnmerge help' is pretty verbose if you need info on the commands
[16:06:07 EST(-0500)] * Sememmon (~Sememmon@unaffiliated/sememmon) has joined ##uportal
[16:42:15 EST(-0500)] * Sememmon (~Sememmon@unaffiliated/sememmon) has joined ##uportal
[16:52:14 EST(-0500)] * awills (~awills@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[16:54:38 EST(-0500)] * lfuller (~sparhk@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[17:00:07 EST(-0500)] * Sememmon (~Sememmon@unaffiliated/sememmon) has joined ##uportal