Page Comparison

[09:25:35 EDT(-0400)] * EricDalquist (n=EricDalq@76.201.148.135) has joined ##uportal
[09:30:37 EDT(-0400)] <EricDalquist> so is there an easy way to find the rev # for when a branch was created?
[09:37:02 EDT(-0400)] * esm (n=esm@clue.mse.jhu.edu) has joined ##uportal
[09:37:13 EDT(-0400)] <EricDalquist> hey
[09:37:25 EDT(-0400)] <esm> hey there
[09:37:27 EDT(-0400)] <EricDalquist> I'm just about to merge maven-simple back into trunk
[09:37:41 EDT(-0400)] <esm> nice
[09:39:56 EDT(-0400)] <esm> merge 4 liiiiiiife
[09:40:02 EDT(-0400)] <EricDalquist>
[09:40:10 EDT(-0400)] <EricDalquist> I'm trying it via eclipse
[09:40:14 EDT(-0400)] <EricDalquist> so we'll see how that goes
[09:40:21 EDT(-0400)] <esm> by the way i saw your bloody beads picture
[09:40:36 EDT(-0400)] <esm> er the damage done to your forehead from beads
[09:40:49 EDT(-0400)] <esm> pretty funny
[09:40:50 EDT(-0400)] <EricDalquist> lol
[09:40:52 EDT(-0400)] <EricDalquist> yeah
[09:41:04 EDT(-0400)] <EricDalquist> dangerous place
[09:42:29 EDT(-0400)] * EricDalquist (n=EricDalq@76.201.148.135) has joined ##uportal
[09:42:35 EDT(-0400)] <EricDalquist> oops
[09:42:44 EDT(-0400)] <EricDalquist> quit the wrong app
[09:43:29 EDT(-0400)] <esm> lol
[09:43:42 EDT(-0400)] <EricDalquist> ok ... killing the subclipse merge
[09:43:49 EDT(-0400)] <esm> oi
[09:43:50 EDT(-0400)] <esm> yeah
[09:43:54 EDT(-0400)] * esm shudders
[09:44:23 EDT(-0400)] <EricDalquist> is there any easy way to find the rev # for when a branch was created?
[09:44:38 EDT(-0400)] <esm> yeah do an 'svn log --stop-on-copy' on the branch
[09:45:05 EDT(-0400)] <EricDalquist> nice
[09:46:48 EDT(-0400)] <esm> http://en.wikipedia.org/wiki/Tammet
[09:47:02 EDT(-0400)] <esm> http://video.google.com/videoplay?docid=-3372301236664593143
[09:47:21 EDT(-0400)] <esm> if you've never seen or heard of Daniel Tammet, and you have 45 min to spare, take a look at this google video.
[09:47:23 EDT(-0400)] <esm> Amazing.
[09:47:58 EDT(-0400)] <EricDalquist> yeah I saw a documentary on him
[09:48:20 EDT(-0400)] <EricDalquist> quite amazing
[09:50:14 EDT(-0400)] <esm> yah, he was on 60 min, and that google video is something from BBC or other European outlet
[09:50:31 EDT(-0400)] <EricDalquist> cool
[09:50:38 EDT(-0400)] <EricDalquist> well
[09:50:39 EDT(-0400)] <EricDalquist> merging
[09:50:40 EDT(-0400)] <esm> better than the 60 minutes one
[09:50:42 EDT(-0400)] <esm> ......
[09:50:44 EDT(-0400)] <EricDalquist> hopefully I did it right
[09:50:46 EDT(-0400)] <esm> crosses fingers
[09:50:48 EDT(-0400)] <esm> ah
[09:50:51 EDT(-0400)] <esm> no problem
[09:51:20 EDT(-0400)] <esm> I'm goign to have to run to a 10:00 am meeting (in 9 minutes) but I should be back in about an hour
[09:51:33 EDT(-0400)] <EricDalquist> svn merge -r 11821:HEAD https://www.ja-sig.org/svn/up3/branches/maven2-simple
[09:51:39 EDT(-0400)] <EricDalquist> ok
[09:53:11 EDT(-0400)] <EricDalquist> ah crap
[09:53:19 EDT(-0400)] <EricDalquist> I needed to run that on the working copy of the trunk
[09:53:24 EDT(-0400)] <EricDalquist> not the working copy of the branch
[09:54:28 EDT(-0400)] <esm> hehe!
[09:54:30 EDT(-0400)] <esm> oh
[09:54:34 EDT(-0400)] <esm> you can use --dry-run
[09:54:37 EDT(-0400)] <esm> on svn merge
[09:54:51 EDT(-0400)] <esm> yeah checkout HEAD of trunk
[09:55:13 EDT(-0400)] <esm> and run the same merge command on the working copy of trunk.
[09:55:28 EDT(-0400)] <esm> I think you can also do the merge with URL's, but it might be safer to do with a local working copy
[09:55:51 EDT(-0400)] <EricDalquist> yeah
[09:56:00 EDT(-0400)] <EricDalquist> I'd rather do it on a working copy
[09:56:04 EDT(-0400)] <esm>
[09:56:05 EDT(-0400)] <EricDalquist> so I can review the changes before commiting
[09:56:08 EDT(-0400)] <esm> yeah
[09:57:46 EDT(-0400)] <esm> OK bbib!
[09:57:53 EDT(-0400)] <EricDalquist> later
[11:30:17 EDT(-0400)] <esm> merge go ok?
[11:30:45 EDT(-0400)] <esm> fisheye is being slow
[11:40:22 EDT(-0400)] * lescour (n=JBouncer@adsl-38-10-98.tulsaconnect.com) has joined ##uportal
[11:49:45 EDT(-0400)] <EricDalquist> yeah, it is commited back to the trunk
[11:50:07 EDT(-0400)] <EricDalquist> so I'm going to finish up that wiki page
[11:50:20 EDT(-0400)] <EricDalquist> do we want to branch again?
[11:50:34 EDT(-0400)] <EricDalquist> is there anything valuable on the original maven branch?
[12:20:58 EDT(-0400)] <esm> EricDalquist: lets keep the original maven branch around, because it has some code modules carved up, along with the modifications I made. So it may be useful either as an example, or if the code is good enough, we can merge it.
[12:21:30 EDT(-0400)] <EricDalquist> ok
[12:21:41 EDT(-0400)] <esm> If people don't mind trunk being broken for bits and pieces here and there I woudl say we can do the carving up on trunk.
[12:21:46 EDT(-0400)] <esm> but it may be better to branch
[12:21:50 EDT(-0400)] <EricDalquist> so lets do another branch
[12:22:04 EDT(-0400)] <esm> merge back modules one by one (or a group of modules if they are inter-dependant)
[12:22:11 EDT(-0400)] <EricDalquist> yup
[12:22:20 EDT(-0400)] <EricDalquist> and we can do refactoring in both trunk and the branch
[12:22:26 EDT(-0400)] <EricDalquist> to make sure we don't break things
[12:22:46 EDT(-0400)] <esm> oh right refactoring
[12:22:47 EDT(-0400)] <esm> hmm
[12:23:22 EDT(-0400)] <esm> we discussed earlier that doing as much refactoring up front is desirable. I still think that is the case, what about you?
[12:23:34 EDT(-0400)] <esm> up front meaning prior to any modularization
[12:23:41 EDT(-0400)] <EricDalquist> yeah
[12:23:52 EDT(-0400)] <EricDalquist> I'm thinking it may be the best to do it in both places
[12:24:11 EDT(-0400)] <EricDalquist> so we branch trunk to a maven-mod branch
[12:24:19 EDT(-0400)] <EricDalquist> work on modularization there
[12:24:33 EDT(-0400)] <EricDalquist> as we run into refactoring we do it in trunk and merge it into the branch
[12:24:41 EDT(-0400)] <EricDalquist> using the trunk as a check to make sure things still work
[12:24:47 EDT(-0400)] <esm> what do you think about doing refactoring in the trunk (the refactoring, by definition, wouldn't break trunk)....
[12:24:48 EDT(-0400)] <esm> oh
[12:24:53 EDT(-0400)] <esm> ok I see what you're saying
[12:25:35 EDT(-0400)] <esm> i think it may be hard to merge refactoring from a non-modularized trunk into a moving target (the maven-mod branch)
[12:25:39 EDT(-0400)] <EricDalquist> true
[12:26:23 EDT(-0400)] <esm> i mean maybe not. You'll certainly have to perform some svn jujitsu
[12:26:37 EDT(-0400)] <EricDalquist> yeah
[12:26:51 EDT(-0400)] <esm> the problem is
[12:26:52 EDT(-0400)] <esm> ok
[12:26:56 EDT(-0400)] <EricDalquist> I guess I'm not as worried about keeping history and such correct on both sides
[12:27:08 EDT(-0400)] <EricDalquist> I'd rather keep it correct in the modularization side
[12:27:17 EDT(-0400)] <esm> the problem will be when you have a refactoring from trunk that affects multiple modules in the maven-mod branch.
[12:27:18 EDT(-0400)] <EricDalquist> and just replace the trunk with that when we're done
[12:27:26 EDT(-0400)] <EricDalquist> yup
[12:28:09 EDT(-0400)] <esm> in that case
[12:28:18 EDT(-0400)] <esm> i'd suggest that we make two branches
[12:28:35 EDT(-0400)] <esm> one branch for maven-mod, the other branch for performing refactoring on the trunk
[12:28:45 EDT(-0400)] <esm> that will make the merge from maven-mod back to the "real" trunk easier
[12:28:50 EDT(-0400)] <EricDalquist> okl
[12:29:06 EDT(-0400)] <esm> what do you think? Is that too many branches?
[12:29:07 EDT(-0400)] <EricDalquist> yeah that makes sense
[12:29:18 EDT(-0400)] <EricDalquist> eh I'm not worried about branching
[12:29:24 EDT(-0400)] <esm>
[12:29:25 EDT(-0400)] <esm> ok
[12:29:25 EDT(-0400)] <EricDalquist> that is what it is there for
[12:29:27 EDT(-0400)] <esm> right
[12:30:04 EDT(-0400)] <EricDalquist> ok ... so I have to run out for a bit ... would you be comfortable doing me a favor and making the two branches?
[12:30:08 EDT(-0400)] <esm> sure
[12:30:12 EDT(-0400)] <esm> what do you want the names to be
[12:30:13 EDT(-0400)] <esm> maven-mod
[12:30:17 EDT(-0400)] <esm> and maven-refactor?
[12:30:20 EDT(-0400)] <EricDalquist> sounds good
[12:30:27 EDT(-0400)] <EricDalquist> I'll be back in about 45 minutes
[12:30:39 EDT(-0400)] <esm> np!
[12:30:56 EDT(-0400)] <esm> oh
[12:31:02 EDT(-0400)] <esm> do we want to use the same Jira issue?
[12:31:04 EDT(-0400)] <esm> or another
[12:31:06 EDT(-0400)] <EricDalquist> another
[12:31:11 EDT(-0400)] <esm> ok i'll create that first
[12:31:15 EDT(-0400)] <esm> one for each branch?
[12:31:18 EDT(-0400)] <esm> or one for both
[12:31:22 EDT(-0400)] <EricDalquist> there is that parent maven2 task
[12:31:31 EDT(-0400)] <EricDalquist> I would use the parent m2 task for general stuff
[12:32:05 EDT(-0400)] <esm> http://www.ja-sig.org/issues/browse/UPT-174 is the parent
[12:32:08 EDT(-0400)] <EricDalquist> for the refactoring I'd like to create an issue for each group of changes ie one for IObjectID work, one fo ICache work, etc..
[12:32:19 EDT(-0400)] <esm> i agree, that makes sense
[12:32:42 EDT(-0400)] <EricDalquist> so just ref 174 when creating the branches and for the general m2 work in maven-mod
[12:32:50 EDT(-0400)] <EricDalquist> and we'll use specific tasks for refactoring
[12:32:58 EDT(-0400)] <EricDalquist> ok ... well I need to run ... back in a bit
[12:33:00 EDT(-0400)] <esm> excellent! Ok see you in a few
[13:29:21 EDT(-0400)] <EricDalquist> hey
[13:31:38 EDT(-0400)] <EricDalquist> brb
[13:31:53 EDT(-0400)] * EricDalquist (n=EricDalq@76.201.148.135) has joined ##uportal
[14:00:02 EDT(-0400)] <EricDalquist> thanks for taking care of the branches
[14:16:38 EDT(-0400)] <esm> EricDalquist: np
[14:17:11 EDT(-0400)] <EricDalquist> I'm doing a little jira re-org. I'm going to close 174 and create a new top level issue for the modularization
[14:17:52 EDT(-0400)] <esm> sounds good
[14:18:04 EDT(-0400)] <esm> i'm back and forth right now between my desk and server racks...
[14:18:19 EDT(-0400)] <EricDalquist> cool, I'll post issue ids when I'm done
[14:56:59 EDT(-0400)] <EricDalquist> ok, so the parent issue is UPT-287
[14:57:08 EDT(-0400)] <EricDalquist> and the related issues are linked as blockes
[14:57:11 EDT(-0400)] <EricDalquist> blockers
[15:16:51 EDT(-0400)] <esm> cool