Page Comparison

...

[13:08:34 CDT(-0500)] <EricDalquist> and inject it via spring

[13:09:09 CDT(-0500)] <EricDalquist> private IUserInstanceManager userInstanceManager;

[13:09:09 CDT(-0500)] <EricDalquist> @Autowired

[13:09:09 CDT(-0500)]

 <EricDalquist> public void setUserInstanceManager(IUserInstanceManager userInstanceManager) {...}

[13:09:11 CDT(-0500)] <b-rock> ok hmm. so I'll need to wire it via spring in the toro project.

[13:09:20 CDT(-0500)] <EricDalquist> yup

[13:09:29 CDT(-0500)] <EricDalquist> A LOT of things are no only available as spring injected beans

[13:09:39 CDT(-0500)] <EricDalquist> the eventual goal is that everything is a spring injected bean

[13:09:41 CDT(-0500)] <athena> EricDalquist: maybe another thing to put in the Git documentation would be how to work with a branch

[13:09:51 CDT(-0500)] <athena> like a remote maintainence branch, i mean

[13:09:51 CDT(-0500)] <EricDalquist> like a patches branch?

[13:09:53 CDT(-0500)] <athena> yeah

[13:10:00 CDT(-0500)] <EricDalquist> oh

[13:10:03 CDT(-0500)] <EricDalquist> wait ...

[13:10:03 CDT(-0500)] <b-rock> ok I'll see how far I can get with this. Thanks for your help.

[13:10:09 CDT(-0500)] <EricDalquist> so like 3.2-patches athena?

[13:10:10 CDT(-0500)] <athena> this might also be a good page to link to: http://git.or.cz/course/svn.html

[13:10:12 CDT(-0500)] <athena> yeah

[13:10:12 CDT(-0500)] <EricDalquist> or something ekse?

[13:10:33 CDT(-0500)] <athena> so do git checkout —track -b rel-3-2-patches origin/rel-3-2-patches

[13:10:52 CDT(-0500)] <athena> and then have some notes that if you're on the branch you really want to use rel-3-2-patches instead of master at those relevant spots

[13:10:53 CDT(-0500)] <EricDalquist> ok will do, it should just be a matter of replacing "master" with "rel-3-2-patches"

[13:10:56 CDT(-0500)] <athena> yep

[13:11:17 CDT(-0500)] <athena> confirmed that that all works fine, once you do the checkout —track bit

[13:11:29 CDT(-0500)] <EricDalquist> ah right

[13:11:39 CDT(-0500)] <EricDalquist> that's a good one, need to setup the local branch

[13:11:45 CDT(-0500)] <athena> yeah

[13:19:16 CDT(-0500)] <athena> huh.

[13:19:39 CDT(-0500)] <athena> what version of ant did we require for 3.1?

[13:19:49 CDT(-0500)] <EricDalquist> I can't remember

[13:20:01 CDT(-0500)] <athena> ah, the uportal manual! it has all the answers

[13:20:06 CDT(-0500)] <athena> having some problems building 3.1

[13:20:08 CDT(-0500)] <athena> [artifact:install] An error has occurred while processing the Maven artifact tasks.

[13:20:08 CDT(-0500)] <athena> [artifact:install] Diagnosis:

[13:20:08 CDT(-0500)] <athena> [artifact:install]

[13:20:08 CDT(-0500)] <athena> [artifact:install] Error installing artifact 'org.jasig.portal:uportal-parent:pom': Error installing artifact's metadata: Error installing metadata: Error updating group repository metadata

[13:20:08 CDT(-0500)] <athena> [artifact:install] expected START_TAG or END_TAG not TEXT (position: TEXT seen ...<classifier>site</... @13:27)

[13:20:12 CDT(-0500)] <athena> not sure what the issue is

[13:20:20 CDT(-0500)] <athena> mvn install worked ok

[13:20:26 CDT(-0500)] <athena> ant task produces that error

[15:01:40 CDT(-0500)] <athena> EricDalquist: not sure what i'm doing wrong, but i don't think my fork is getting updated

[15:02:14 CDT(-0500)] <EricDalquist> you see commits on jasig/uportal that are not on athena/uportal?

[15:02:22 CDT(-0500)] <athena> yeah

[15:02:51 CDT(-0500)] <EricDalquist> which ones?

[15:03:22 CDT(-0500)] <athena> pretty much everything since oct 18 when i forked it

[15:03:34 CDT(-0500)] <athena> except the two changes i just committed, since i pushed those to my fork first

[15:03:59 CDT(-0500)] <EricDalquist> did you do the "keeping your fork up to date" section on: https://wiki.jasig.org/display/UPC/Git+Tips+and+Tricks

[15:04:07 CDT(-0500)] <EricDalquist> for the branch in question?

[15:04:08 CDT(-0500)] <athena> yeah

[15:04:22 CDT(-0500)] <athena> those log statements never show anything, either

[15:05:16 CDT(-0500)] <athena> oh ack.

[15:05:17 CDT(-0500)] <athena> sigh

[15:05:42 CDT(-0500)] <EricDalquist> ?

[15:05:53 CDT(-0500)] <athena> looks like i accidentally added my own branch as the upstream that last time

[15:06:01 CDT(-0500)] <athena> that would definitely make it look like they always matched, huH?

[15:06:11 CDT(-0500)] <EricDalquist> ah yeah

[15:06:14 CDT(-0500)] <athena> heh.

[15:09:27 CDT(-0500)] <athena> aaaack

[15:09:33 CDT(-0500)] <EricDalquist> uh oh

[15:09:36 CDT(-0500)] <athena> yeah.

[15:09:56 CDT(-0500)] <athena> think i screwed up

[15:10:00 CDT(-0500)] <EricDalquist> things all screwy?

[15:10:37 CDT(-0500)] <athena> umm, think i committed something i shouldn't have to the jasig side :/

[15:11:08 CDT(-0500)] <EricDalquist> https://github.com/Jasig/uPortal/commit/c145935bde1d1e607947d784eb3604c9379cc26e

[15:11:09 CDT(-0500)] <EricDalquist> that?

[15:11:21 CDT(-0500)] <athena> yeah

[15:11:29 CDT(-0500)] <athena> clearly that doesn't look good at all

[15:11:47 CDT(-0500)] <EricDalquist> ok, just a minute

[15:11:51 CDT(-0500)] <athena> sorry :/

[15:11:55 CDT(-0500)] <EricDalquist> no problem

[15:12:33 CDT(-0500)] <EricDalquist> what does "git remote -v" show you?

[15:12:48 CDT(-0500)] <athena> origin git@github.com:/bourey/uPortal.git (fetch)

[15:12:48 CDT(-0500)] <athena> origin git@github.com:/bourey/uPortal.git (push)

[15:12:48 CDT(-0500)] <athena> upstream git@github.com:Jasig/uPortal.git (fetch)

[15:12:48 CDT(-0500)] <athena> upstream git@github.com:Jasig/uPortal.git (push)

[15:12:56 CDT(-0500)] <EricDalquist> ok

[15:12:57 CDT(-0500)] <EricDalquist> try:

[15:13:08 CDT(-0500)] <EricDalquist> git push -f upstream HEAD^:master

[15:13:31 CDT(-0500)] <EricDalquist> that should un-push the last commit from upstream (jasig/uportal)

[15:13:44 CDT(-0500)] <athena> excelletn

[15:13:59 CDT(-0500)] <athena> looks like that did do it

[15:14:07 CDT(-0500)] <EricDalquist> great

[15:14:14 CDT(-0500)] <athena> thanks so much - sorry about that

[15:14:20 CDT(-0500)] <athena> really not sure what happened there

[15:14:21 CDT(-0500)] <EricDalquist> no problem

[15:14:31 CDT(-0500)] <EricDalquist> do you have a lot of local work in progress?

[15:14:33 CDT(-0500)] <athena> no

[15:14:35 CDT(-0500)] <athena> nothing

[15:14:36 CDT(-0500)] <EricDalquist> if not you can always refork and reclone

[15:14:45 CDT(-0500)] <EricDalquist> just to make sure you're in the state you think you are

[15:14:48 CDT(-0500)] <athena> yeah

[15:15:42 CDT(-0500)] <athena> think i may need to

[15:15:49 CDT(-0500)] <athena> seems like something got pretty screwed up in my fork

[15:17:46 CDT(-0500)] <athena> yeah, guessing i must have screwed up this merge somehow

[15:17:59 CDT(-0500)] <athena> https://github.com/bourey/uPortal/commit/c145935bde1d1e607947d784eb3604c9379cc26e

[15:18:14 CDT(-0500)] <athena> my fork thinks those are all brand new commits that aren't on the uportal side now

[15:18:50 CDT(-0500)] <EricDalquist> probably because of that original upstream issue

[15:18:56 CDT(-0500)] <athena> yeah, probably

[15:18:58 CDT(-0500)] <EricDalquist> you thought things were in sync

[15:19:03 CDT(-0500)] <EricDalquist> but they actually weren't

[15:19:07 CDT(-0500)] <athena> well, guess i can delete and recreate

[15:19:08 CDT(-0500)] <EricDalquist> which caused git to get confused

[15:19:10 CDT(-0500)] <EricDalquist> yeah

[15:19:14 CDT(-0500)] <athena> just a whole lot of time redownloading

[15:20:13 CDT(-0500)] <EricDalquist> :/

[15:20:17 CDT(-0500)] <athena> s'ok

[15:20:20 CDT(-0500)] <athena> live and learn and all that

[15:21:10 CDT(-0500)] <athena> so i just delete my repository on github, then go back to uportal and recreate it?

[15:21:18 CDT(-0500)] <EricDalquist> yup