[06:30:38 CDT(-0500)] * tsnfoo (~tsnfoo@cpe-173-88-27-191.columbus.res.rr.com) has joined ##uportal
[07:08:34 CDT(-0500)] * jessm (~Jess@c-68-40-84-116.hsd1.mi.comcast.net) has joined ##uportal
[08:00:30 CDT(-0500)] * tsnfoo (~tsnfoo@wso-mbp15-2.test.denison.edu) has joined ##uportal
[08:06:04 CDT(-0500)] * tsnfoo_ (~tsnfoo@cpe-173-88-27-191.columbus.res.rr.com) has joined ##uportal
[08:40:22 CDT(-0500)] * lfuller (~sparhk@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[09:35:40 CDT(-0500)] * athena (~athena@c-76-121-97-221.hsd1.wa.comcast.net) has joined ##uportal
[09:49:37 CDT(-0500)] * holdorph (~holdorph@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[10:00:46 CDT(-0500)] * athena (~athena@c-76-121-97-221.hsd1.wa.comcast.net) has joined ##uportal
[10:07:35 CDT(-0500)] * bsparks (~bsparks@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[10:12:48 CDT(-0500)] * bsparks (~bsparks@wsip-72-215-204-133.ph.ph.cox.net) has left ##uportal
[10:20:14 CDT(-0500)] * awills (~awills@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[10:29:59 CDT(-0500)] * EricDalquist (~apollo@ip68-6-110-30.sb.sd.cox.net) has joined ##uportal
[10:30:24 CDT(-0500)] * JoeMoore (89d880aa@gateway/web/freenode/ip.137.216.128.170) has joined ##uportal
[11:04:58 CDT(-0500)] * EricDalquist (~apollo@ip68-6-110-30.sb.sd.cox.net) has joined ##uportal
[11:08:01 CDT(-0500)] <awills> EricDalquist the cache annotations for email-preview are done & committed... if you're curios and want to see how someone new to your tech would interpret and implement it
[11:08:49 CDT(-0500)] <EricDalquist> sure
[11:08:55 CDT(-0500)] <EricDalquist> glad it worked
[11:09:38 CDT(-0500)] <awills> all indications are that it is I watched the behavior in jconsole
[11:10:08 CDT(-0500)] <EricDalquist> code looks great
[11:10:59 CDT(-0500)] <EricDalquist>
[11:11:27 CDT(-0500)] <awills> i also implemented the Refresh button yesterday in js... that was far harder
[11:17:15 CDT(-0500)] <athena> ack
[11:17:25 CDT(-0500)] <athena> i have a svn repository that's in a world of hurt
[11:17:45 CDT(-0500)] <athena> it's now showing that basically the entirety of certain files are in conflict
[11:17:57 CDT(-0500)] <athena> because the line ending styles don't match
[11:18:04 CDT(-0500)] <athena> anyone have a suggestion for that? :/
[11:18:30 CDT(-0500)] <athena> the files don't have inconsistent newlines within them
[11:18:43 CDT(-0500)] <EricDalquist> uhg
[11:18:47 CDT(-0500)] <athena> but the newest vendor import i guess has different newline styles than what was there before
[11:18:48 CDT(-0500)] <athena> yeah
[11:18:59 CDT(-0500)] <EricDalquist> svn co
[11:19:02 CDT(-0500)] <EricDalquist> dos2unix
[11:19:04 CDT(-0500)] <EricDalquist> commit
[11:19:05 CDT(-0500)] <EricDalquist> import?
[11:19:43 CDT(-0500)] <athena> dunno
[11:19:47 CDT(-0500)] <athena> guess maybe that would do it :/
[11:19:57 CDT(-0500)] <athena> not sure what happened though
[11:20:03 CDT(-0500)] <athena> i mean, i've never seen that before, have you?
[11:20:16 CDT(-0500)] <EricDalquist> I haven't
[11:20:23 CDT(-0500)] <EricDalquist> but I haven't done vendor branches in SVN
[11:20:32 CDT(-0500)] <athena> dunno if it's because the eol-style wasn't set in their vendor branch in the past, or what
[11:20:32 CDT(-0500)] <athena> ah
[11:20:37 CDT(-0500)] <athena> how do you guys maintain changes?
[11:20:48 CDT(-0500)] <EricDalquist> we're still on CVS
[11:21:56 CDT(-0500)] <athena> ah
[11:22:09 CDT(-0500)] <athena> man, i can't figure out what happened here - this behavior just doesn't seem right
[11:22:11 CDT(-0500)] <EricDalquist> so maybe check out
[11:22:27 CDT(-0500)] <EricDalquist> dos2unix the whole tree
[11:22:55 CDT(-0500)] <EricDalquist> find . -type f -exec 'svn propset eol-style...'
[11:22:56 CDT(-0500)] <EricDalquist> commit
[11:23:03 CDT(-0500)] <EricDalquist> that would be a big change set
[11:23:09 CDT(-0500)] <EricDalquist> but at least get you to a consistent state
[11:23:25 CDT(-0500)] <athena> yeah
[11:23:30 CDT(-0500)] <athena> that might do it
[11:23:40 CDT(-0500)] <athena> just checked and the files in the trunk don't have any eol-style property set
[11:23:53 CDT(-0500)] <athena> whereas the newer vendor stuff does
[11:23:54 CDT(-0500)] <athena> ugh
[11:24:08 CDT(-0500)] <athena> another reason to consistently use an svn config file
[11:25:24 CDT(-0500)] <holdorph> that was a mistake of svn, to not have that be a default config of the repository.
[11:25:30 CDT(-0500)] <athena> think i can actually dos2unix the whole thing or will that pick up non-text files too?
[11:25:35 CDT(-0500)] <athena> yes, i totally agree
[11:25:41 CDT(-0500)] <holdorph> they should have taken that feature from perforce.... sigh
[11:56:29 CDT(-0500)] * lfuller (~sparhk@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[12:26:10 CDT(-0500)] <athena> in case anyone's interested in the command i finally wound up with:
[12:26:19 CDT(-0500)] <athena> find . -type f -not ( -path ".svn" -o -path ".png" -o -path ".gif" -o -path ".jpg" ) -exec svn propset svn:eol-style native {} \;
[12:31:48 CDT(-0500)] <athena> looks like the only binary files it caught that i hadn't excluded were .psd and .ico
[12:33:17 CDT(-0500)] <EricDalquist> nice
[12:33:37 CDT(-0500)] <athena> i need to write up a blog post on properly managing svn vendor branches or soimething
[12:33:48 CDT(-0500)] <athena> can cause so many headaches
[12:33:57 CDT(-0500)] <athena> does svn 6 change any of that do you know?
[12:34:10 CDT(-0500)] <EricDalquist> not that I know of
[12:34:24 CDT(-0500)] <EricDalquist> but I'm not up on their changelog
[12:34:46 CDT(-0500)] <athena> yeah
[12:34:58 CDT(-0500)] <athena> and a lot of repositories i've seen are still svn 1.5 or whatever
[12:49:05 CDT(-0500)] <EricDalquist> I've thought a few times about putting together a script to enforce the svn config settings on a project
[12:49:26 CDT(-0500)] <EricDalquist> something that would iterate through the files in a project, run d2u and set the correct properties
[12:50:08 CDT(-0500)] <EricDalquist> based on the mappings in .svn/config
[12:59:11 CDT(-0500)] <athena> yeah that would be terrific
[12:59:17 CDT(-0500)] <athena> should be pretty possible
[12:59:20 CDT(-0500)] <EricDalquist> yeah
[12:59:25 CDT(-0500)] <EricDalquist> if only I was better w/perl
[12:59:27 CDT(-0500)] <athena> you'd want to have it print out something at the end describing anything it couldn't do
[12:59:29 CDT(-0500)] <athena> yeah, me too
[12:59:32 CDT(-0500)] <EricDalquist> yeah
[12:59:42 CDT(-0500)] <EricDalquist> I have a coworker who is a perl whiz
[12:59:49 CDT(-0500)] <EricDalquist> I'll ask him when I get back to UW
[13:10:41 CDT(-0500)] <athena> nice
[13:10:51 CDT(-0500)] <athena> i just don't do stuff like that often enough to keep any of it in my head
[13:10:55 CDT(-0500)] <EricDalquist> yeah
[13:11:06 CDT(-0500)] <EricDalquist> I usually get him to give me a base for the script
[13:11:11 CDT(-0500)] <EricDalquist> then I can extend it from there
[14:08:38 CDT(-0500)] <EricDalquist> I'll do some testing on it this week and get it posted
[14:38:18 CDT(-0500)] * tsnfoo (~tsnfoo@wso-mbp15-2.test.denison.edu) has joined ##uportal
[15:02:09 CDT(-0500)] * lfuller (~sparhk@wsip-72-215-204-133.ph.ph.cox.net) has joined ##uportal
[15:17:41 CDT(-0500)] <athena> nice!
General
Content
Integrations