Child pages
  • uPortal IRC Logs-2012-05-14
Skip to end of metadata
Go to start of metadata

[11:00:59 CDT(-0500)] <peterjhart> When working on the mobile theme, I didn't see any mention in the wiki on the right way to get the mobile theme to display on a desktop. I wrote out instructions and Laura put it up: https://wiki.jasig.org/display/UPM40/How+to+View+the+Mobile+Theme

[11:01:26 CDT(-0500)] <peterjhart> Is it overkill to give instructions for each browser, or should I have just said "change your user agent string"?

[11:01:32 CDT(-0500)] <EricDalquist> awesome

[11:01:45 CDT(-0500)] <EricDalquist> I think it is just fine

[11:01:51 CDT(-0500)] <peterjhart> k

[11:19:03 CDT(-0500)] <athena> thanks so much peterjhart (smile)

[11:19:39 CDT(-0500)] <EricDalquist> peterjhart: would you be able to look at this branch : https://github.com/jasig/uPortal/tree/UP-3456

[11:19:52 CDT(-0500)] <EricDalquist> and see if the build time SASS -> CSS works for you?

[11:20:52 CDT(-0500)] <EricDalquist> that branch should be setup so that all of the SASS templates are compiled during the uportal-war build

[11:21:06 CDT(-0500)] <EricDalquist> and all of the .css files that were generated from SASS templates have been deleted from version control

[11:32:53 CDT(-0500)] <peterjhart> ok

[11:33:08 CDT(-0500)] <peterjhart> I should be able to take a look later this morning

[11:33:30 CDT(-0500)] <EricDalquist> thanks!

[13:54:35 CDT(-0500)] <JoeMoore> Error on initdb for 4.0.5 The specified member was not found: Authenticated Users

[13:56:06 CDT(-0500)] <EricDalquist> are you using the default data set JoeMoore?

[13:56:12 CDT(-0500)] <EricDalquist> and if so can you please provide more context

[13:56:21 CDT(-0500)] <EricDalquist> like a full stack trace via pastbin or gist?

[13:58:18 CDT(-0500)] <JoeMoore> actual error http://pastebin.com/kTVhdnMg

[13:58:40 CDT(-0500)] <EricDalquist> are you using the default 4.0.5 data set?

[13:59:00 CDT(-0500)] <JoeMoore> I believe that is correct.

[13:59:33 CDT(-0500)] <JoeMoore> Ive had the portal running on a quickstart that was actually from 4.0.4

[14:00:09 CDT(-0500)] <JoeMoore> but id done redeploys from 4.0.5. I then wanted a fresh initdb without overwriting my hsql.

[14:00:25 CDT(-0500)] <JoeMoore> because ant data-export was failing.

[14:00:39 CDT(-0500)] <JoeMoore> but I wasn't ready to throw it away.

[14:00:56 CDT(-0500)] <EricDalquist> so I'm not sure I follow

[14:01:00 CDT(-0500)] <EricDalquist> initdb will drop and recreate the tables

[14:01:03 CDT(-0500)] <EricDalquist> you did not do that?

[14:02:06 CDT(-0500)] <JoeMoore> I started hsql from the source instead of the quickstart, realizing that would be a different db.

[14:02:40 CDT(-0500)] <EricDalquist> from a different source checkout or from the source checkout included with the quickstart?

[14:03:25 CDT(-0500)] <JoeMoore> The one I was trying to run initdb on was the source checkout from 4.0.5--not a quickstart.

[14:03:52 CDT(-0500)] <JoeMoore> Im still having trouble telling exact 'revision' numbers when I'm using git

[14:04:19 CDT(-0500)] <EricDalquist> how did you do the checkout of 4.0.5?

[14:04:26 CDT(-0500)] <EricDalquist> then we can figure out the version

[14:05:37 CDT(-0500)] <JoeMoore> Im still finding my way around. I did a git clone, and then created a project in eclipse using the git plugin.

[14:05:54 CDT(-0500)] <EricDalquist> no problem

[14:06:08 CDT(-0500)] <EricDalquist> so you did something like "git clone git://github.com/Jasig/uPortal.git"

[14:06:22 CDT(-0500)] <EricDalquist> which created a local clone of the entire uPortal repository on your machine

[14:06:33 CDT(-0500)] <EricDalquist> did you do anything else?

[14:08:35 CDT(-0500)] <JoeMoore> How can I quickly tell you the last commit that wasn't mine? When I look at history on the uPortal4 branch, I see 0027582d447c5f3bf5d51c6539700ef317e1404c

[14:09:01 CDT(-0500)] <JoeMoore> And I dont know how to copy and paste the description that says UP-3350... from Jen Bourey

[14:10:02 CDT(-0500)] <JoeMoore> In the old days I'd refer to a sequential version number and you would know exactly where I am?

[14:10:12 CDT(-0500)] <EricDalquist> I'm not sure what you're trying to do.

[14:10:13 CDT(-0500)] <EricDalquist> right

[14:10:20 CDT(-0500)] <EricDalquist> and I can give you a way to get close to that

[14:10:30 CDT(-0500)] <EricDalquist> but I just need some context information first (smile)

[14:11:11 CDT(-0500)] <EricDalquist> so a few questions:

[14:11:11 CDT(-0500)] <EricDalquist> Are you using a command line git client or the eclipse plugin?

[14:11:11 CDT(-0500)] <EricDalquist> Have you run any git commands beyond cloning the uPortal git repository?

[14:11:42 CDT(-0500)] <JoeMoore> OK, back to basics. My ide is indigo SR2, and yes I did something after cloning it. I believe I created a master.

[14:12:20 CDT(-0500)] <JoeMoore> I also have the Windows bash version of command line git. Thanks for not whipping me with a wet noodle for using Windows (smile).

[14:13:58 CDT(-0500)] <EricDalquist> lol, no problem and thanks for the context (smile)

[14:14:28 CDT(-0500)] <EricDalquist> so one thing to remember when using git is that the GitHub website is a wonderful tool

[14:14:54 CDT(-0500)] <JoeMoore> Yes, the last time I was there I tried to update a clone I'd made months ago when you first went to git.

[14:15:31 CDT(-0500)] <JoeMoore> And what i was seeing on the screen did not match the way I was being told to update my clone.

[14:15:42 CDT(-0500)] <JoeMoore> I'll log in there as well

[14:15:52 CDT(-0500)] <EricDalquist> hrm ... I wonder if github has changed there UI

[14:15:58 CDT(-0500)] <EricDalquist> I'll make a note to review those instructions

[14:16:06 CDT(-0500)] <EricDalquist> next ... your goal ... you want to have a local checkout of 4.0.5 correct?

[14:17:04 CDT(-0500)] <JoeMoore> I do have that, I can tell by the snapshots. What I don't know is whether I have the base version of 4.0.5 or a more recent update--what used to be trunk.

[14:18:05 CDT(-0500)] <EricDalquist> do you just want this 4.0.5 checkout to try to build with

[14:18:11 CDT(-0500)] <EricDalquist> or are you planning on making customizations to it?

[14:18:34 CDT(-0500)] <JoeMoore> Ive already made a few customizations. Not many, but they work (smile)

[14:18:45 CDT(-0500)] <EricDalquist> ok ...

[14:19:07 CDT(-0500)] <EricDalquist> I'm going to rely on the command line here, just because we can be more explicit than mucking through the eclipse UI

[14:19:23 CDT(-0500)] <JoeMoore> Until I tried to do the export... so maybe thats where I should have started. I tend to drop you guys in the middle sometimes (sad)

[14:19:25 CDT(-0500)] <EricDalquist> what does "git status" show you when you run it in your uPortal clone

[14:19:52 CDT(-0500)] <EricDalquist> not a problem if you don't mind me asking all sorts of questions (tongue)

[14:23:06 CDT(-0500)] <JoeMoore> http://pastebin.com/ZsphkVE2

[14:23:55 CDT(-0500)] <EricDalquist> so that first line "# On branch master" means that you are on what used to be called trunk

[14:24:00 CDT(-0500)] <EricDalquist> and not the 4.0.5 release

[14:24:14 CDT(-0500)] <EricDalquist> well ... very likely at least

[14:24:16 CDT(-0500)] <JoeMoore> OK--makes sense to me.

[14:24:32 CDT(-0500)] <EricDalquist> so what you want to do I think is create a custom branch off of the 4.0.5 tag

[14:24:38 CDT(-0500)] <EricDalquist> and do your customization work there

[14:25:00 CDT(-0500)] <JoeMoore> I think I did that already, but thats where it gets real confusing (to me).

[14:25:23 CDT(-0500)] <EricDalquist> ok

[14:25:50 CDT(-0500)] <EricDalquist> can you pastebin "git branch -a"

[14:25:52 CDT(-0500)] <JoeMoore> eclipse points to that same directory and has a few decorated files and it has a few of my local commits (realizing that I'm still unclear what that really means in git)

[14:26:08 CDT(-0500)] <EricDalquist> we can chat about that too (smile)

[14:29:03 CDT(-0500)] <JoeMoore> Took me a long time to set my git context in bash. Finally there.

[14:29:11 CDT(-0500)] <EricDalquist> no problem

[14:30:26 CDT(-0500)] <JoeMoore> http://pastebin.com/TkaNkDxy

[14:30:38 CDT(-0500)] <EricDalquist> ok

[14:30:48 CDT(-0500)] <EricDalquist> and one more and I'll know right where we are

[14:31:29 CDT(-0500)] <EricDalquist> "git log -10 > last_10_commits.txt"

[14:31:36 CDT(-0500)] <EricDalquist> once I get that we can move forward (smile)

[14:34:58 CDT(-0500)] <JoeMoore> http://pastebin.com/gpqrK3DV

[14:37:17 CDT(-0500)] <JoeMoore> And that does match what I'm seeing in eclipse (in terms of commits)

[14:37:23 CDT(-0500)] <EricDalquist> ok ... I lied ... one more question. Can you pastbin the contents of /uPortal/.git/config

[14:39:04 CDT(-0500)] <JoeMoore> http://pastebin.com/S0eLMVgt

[14:39:23 CDT(-0500)] <JoeMoore> No problem.

[14:40:50 CDT(-0500)] <EricDalquist> and being on windows I have no idea what this will do but what happens if you run "gitk" on your command line in the uPortal dir?

[14:42:09 CDT(-0500)] <JoeMoore> I had to run it in bash (of course) and it started a very interesting gui (which I assume is a Good Thing)

[14:42:15 CDT(-0500)] <EricDalquist> yes

[14:42:32 CDT(-0500)] <EricDalquist> so this gui is a very nice visualization tool for the git history

[14:42:44 CDT(-0500)] <EricDalquist> looking at the log you pasted

[14:42:55 CDT(-0500)] <JoeMoore> I can see that! Of course, it will take me awhile to figure out what I'm looking at (smile).

[14:43:02 CDT(-0500)] <EricDalquist> yup

[14:43:10 CDT(-0500)] <EricDalquist> you are working off of uPortal master (trunk) from 3/28 with two local commits

[14:43:21 CDT(-0500)] <JoeMoore> Sounds right.

[14:43:21 CDT(-0500)] <EricDalquist> this is about 15 commits after 4.0.4 was tagged

[14:44:02 CDT(-0500)] <JoeMoore> OK--I see the dates so it's easy to relate like dated revisions did before.

[14:44:14 CDT(-0500)] <EricDalquist> so once we're done this is a handy site that explains all the stuff that gitk is showing you http://lostechies.com/joshuaflanagan/2010/09/03/use-gitk-to-understand-git/

[14:45:23 CDT(-0500)] <JoeMoore> Got it in my evernote log to go with this session

[14:45:42 CDT(-0500)] <EricDalquist> so what I'd like to do with you is:

[14:45:42 CDT(-0500)] <EricDalquist> make a note of the two local commits (one by you and one by drew) on your master branch

[14:45:42 CDT(-0500)] <EricDalquist> reset your master branch so that it matches up with the Jasig master branch

[14:45:42 CDT(-0500)] <EricDalquist> create a branch off of the uPortal 4.0.5 where you can do your customization work

[14:45:49 CDT(-0500)] <EricDalquist> does that sound reasonable?

[14:46:43 CDT(-0500)] <JoeMoore> In concept (smile)

[14:47:34 CDT(-0500)] <EricDalquist> so a little background ... git isn't linear like SVN was, it is a directed graph

[14:48:01 CDT(-0500)] <EricDalquist> and we can do some work to move the HEAD of a branch (a pointer to a node in that graph) to a different location

[14:48:27 CDT(-0500)] <EricDalquist> so we have the commit IDs of the two changes you and drew made here: http://pastebin.com/gpqrK3DV

[14:48:32 CDT(-0500)] <EricDalquist> which we'll come back to at the end

[14:48:40 CDT(-0500)] <JoeMoore> Get the not linear--the true model will become more clear over time.

[14:49:19 CDT(-0500)] <EricDalquist> commit 002758 is the last commit in your log that corresponds with a commit in the Jasig master branch so I want you to run "git reset --hard HEAD 002758"

[14:49:51 CDT(-0500)] <EricDalquist> that will move the HEAD of your local master branch from your latest commit to commit 002758 (kinda like rewinding 2 commits)

[14:50:17 CDT(-0500)] <JoeMoore> is there a place for the command in gitk, or should I do that directly from bash?

[14:50:38 CDT(-0500)] <EricDalquist> directly from bash. gitk is just a visualization tool

[14:51:21 CDT(-0500)] <EricDalquist> if you need your bash shell back you can always close gitk and re-run it doing "gitk&"

[14:53:51 CDT(-0500)] <EricDalquist> let me know when you've run the reset command and we'll move on to the next step (smile)

[14:55:28 CDT(-0500)] <JoeMoore> Im back...

[14:55:51 CDT(-0500)] <JoeMoore> fatal~ Cannot do hard reset with paths.

[14:56:38 CDT(-0500)] <EricDalquist> hrm ... ok different approach then, give me 1 minutes

[14:56:47 CDT(-0500)] <JoeMoore> Im doing it from the context of the uPortal directory (new bash window becuase gitk is modal)

[14:57:04 CDT(-0500)] <EricDalquist> yup

[14:58:36 CDT(-0500)] <EricDalquist> ok lets rename your master branch

[14:58:46 CDT(-0500)] <EricDalquist> "git branch -m old_master master"

[15:00:01 CDT(-0500)] <JoeMoore> OK (I had to reverse old and new names--just in case someone reads this log).

[15:00:21 CDT(-0500)] <EricDalquist> ah right

[15:00:22 CDT(-0500)] <EricDalquist> sorry

[15:00:35 CDT(-0500)] <EricDalquist> ok next we're going to make sure you have the latest changes from the Jasig repo

[15:00:40 CDT(-0500)] <EricDalquist> "git fetch --all"

[15:00:51 CDT(-0500)] <EricDalquist> that will fetch all of the remote commits from all the remote repositories

[15:01:05 CDT(-0500)] <EricDalquist> but it won't touch any of your local branches leaving you to do that later

[15:01:13 CDT(-0500)] <JoeMoore> OK, it's done with some statistics.

[15:02:02 CDT(-0500)] <EricDalquist> now we're going to create a new local master branch.

[15:02:14 CDT(-0500)] <EricDalquist> "git checkout -b master -t origin/master"

[15:02:36 CDT(-0500)] <EricDalquist> that says "create local branch master which tracks remote branch origin/master and switch to it now"

[15:04:06 CDT(-0500)] <JoeMoore> dang! I had some uncommitted changes. I should have realized that.

[15:04:16 CDT(-0500)] <EricDalquist> did you get an error?

[15:04:23 CDT(-0500)] <EricDalquist> we can save them (smile)

[15:04:27 CDT(-0500)] <EricDalquist> git has the power!

[15:04:28 CDT(-0500)] <EricDalquist> (wink)_

[15:05:24 CDT(-0500)] <JoeMoore> I knew that (smile), I just didn't know which steps we'd ned to go back to if any. It says commit or stash them before I can switch

[15:05:32 CDT(-0500)] <EricDalquist> great

[15:05:38 CDT(-0500)] <EricDalquist> so here is awesome feature #1 of git

[15:05:41 CDT(-0500)] <EricDalquist> do "git stash"

[15:06:01 CDT(-0500)] <EricDalquist> that essentially creates a patch of your local mods

[15:06:04 CDT(-0500)] <EricDalquist> stores it on a stack

[15:06:12 CDT(-0500)] <EricDalquist> and resets your current branch to its prestine state

[15:06:28 CDT(-0500)] <EricDalquist> later you can do "git stash pop" to apply that patch to your current branch

[15:07:10 CDT(-0500)] <JoeMoore> cool. It said it was saved and HEAD is now at 927cbb1 ...

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

[15:07:29 CDT(-0500)] <EricDalquist> try "git checkout master"

[15:07:43 CDT(-0500)] <EricDalquist> I'm not sure how much of the branch/track command it got through

[15:08:09 CDT(-0500)] <JoeMoore> it didn't look like it did anything, so should I include the -b -t?

[15:08:36 CDT(-0500)] <JoeMoore> the first line last time was error

[15:08:51 CDT(-0500)] <EricDalquist> yeah redo "git checkout -b master -t origin/master"

[15:09:24 CDT(-0500)] <JoeMoore> spun through a lot of files and did the switch

[15:09:47 CDT(-0500)] <EricDalquist> great .. give me 2 minutes someone stopped in

[15:19:35 CDT(-0500)] <EricDalquist> ok

[15:19:56 CDT(-0500)] <EricDalquist> so now we need to create a branch off of 4.0.5 for you

[15:20:32 CDT(-0500)] <EricDalquist> which looks similar "git checkout -b yourbranchname uportal-4.0.5"

[15:20:46 CDT(-0500)] <EricDalquist> that will create a branch off of the commit that is tagged with uportal 4.0.5

[15:20:53 CDT(-0500)] <EricDalquist> and place you there

[15:22:07 CDT(-0500)] <JoeMoore> Looks good

[15:22:18 CDT(-0500)] <EricDalquist> ok ... now to get your old changes merged back in

[15:22:24 CDT(-0500)] <EricDalquist> looking at http://pastebin.com/gpqrK3DV

[15:22:31 CDT(-0500)] <EricDalquist> we want to get those top two commits

[15:22:56 CDT(-0500)] <EricDalquist> each of these commands may result in a merge conflict which would need to be resolved before moving on to the next command

[15:23:10 CDT(-0500)] <JoeMoore> OK, I get that.

[15:23:19 CDT(-0500)] <EricDalquist> "git cherry-pick 5cd2756fe1e5bee563c918c0f6abc38697d0f73e"

[15:23:19 CDT(-0500)] <EricDalquist> "git cherry-pick 927cbb1b2deae6bb92694b535d9b6ba3fcf63d4f"

[15:23:19 CDT(-0500)] <EricDalquist> "git stash pop"

[15:23:39 CDT(-0500)] <EricDalquist> so the cherry-pick command says "take the changes that commit X made and try to apply them to where I am right now"

[15:23:58 CDT(-0500)] <EricDalquist> it also copies over all the commit info (author, date, msg, etc)

[15:24:46 CDT(-0500)] <JoeMoore> The first one listed 3 untracked files, all cas logs. So Im not worried about that.

[15:25:21 CDT(-0500)] <JoeMoore> I don't know why those changes were isolated in my log because I don't remember doing anything special with them?

[15:25:31 CDT(-0500)] <EricDalquist> ok ... those are probably files that have been tagging along for the ride the whole time. git simply ignores untracked files and leaves them be

[15:25:42 CDT(-0500)] <EricDalquist> those changes being those two commits we just cherry-picked?

[15:26:10 CDT(-0500)] <JoeMoore> the first cherry-pick that was marked with drews name

[15:26:36 CDT(-0500)] <JoeMoore> the 2nd cherry pick replaced 6 files which was about what I would expect.

[15:26:44 CDT(-0500)] <EricDalquist> great

[15:27:57 CDT(-0500)] <JoeMoore> stash pop had a conflict on cas/pom.xml which is also not a surprise. I'll double check that one.

[15:28:04 CDT(-0500)] <EricDalquist> sounds good

[15:28:08 CDT(-0500)] <EricDalquist> you'll need to resolve the conflict

[15:28:19 CDT(-0500)] <EricDalquist> then do "git add cas/pom.xml"

[15:28:33 CDT(-0500)] <EricDalquist> oh wait ... soprry this was from the stash pop

[15:28:35 CDT(-0500)] <EricDalquist> ignore that git add bit

[15:28:43 CDT(-0500)] <EricDalquist> I was thinking we were resolving a merge issue on the cherry pick

[15:28:47 CDT(-0500)] <EricDalquist> so one more question

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

[15:28:59 CDT(-0500)] <JoeMoore> it actually said it autoresolved it, so Ill just double check it before doing a redeploy

[15:29:03 CDT(-0500)] <EricDalquist> oh nice

[15:29:10 CDT(-0500)] <EricDalquist> git is pretty good about smart conflict resolution

[15:29:23 CDT(-0500)] <EricDalquist> if the conflicting file has different areas that changed

[15:30:01 CDT(-0500)] <JoeMoore> origin https://github.com/Jasig/uPortal.git (fetch)

[15:30:06 CDT(-0500)] <JoeMoore> origin https://github.com/Jasig/uPortal.git (push)

[15:30:31 CDT(-0500)] <EricDalquist> ok

[15:31:02 CDT(-0500)] <EricDalquist> do you have any plans to have a private fork of uPortal either on github or locally to manage your changes?

[15:32:07 CDT(-0500)] <JoeMoore> First help me understand what I did before. Did I commit changes to my clone?

[15:32:24 CDT(-0500)] <EricDalquist> yes

[15:32:32 CDT(-0500)] <EricDalquist> you had two commits to your clone

[15:32:43 CDT(-0500)] <JoeMoore> If that is what I did, it seems like having a private fork is what I would have wanted to do (smile)

[15:32:59 CDT(-0500)] <EricDalquist> so those commits only exist on your machine

[15:33:08 CDT(-0500)] <EricDalquist> ok you want to do that now?

[15:33:13 CDT(-0500)] <EricDalquist> I still have some time to help (smile)

[15:33:48 CDT(-0500)] <JoeMoore> Just to clarify what I'd done before first. If I was a co-committer, what I did before would make more sense, right?

[15:33:59 CDT(-0500)] <EricDalquist> yes

[15:34:03 CDT(-0500)] <JoeMoore> Since Im not, its much cleaner to create a private fork.

[15:34:07 CDT(-0500)] <EricDalquist> yes

[15:34:14 CDT(-0500)] <EricDalquist> even I have a personal fork

[15:34:26 CDT(-0500)] <EricDalquist> since I can then push feature branches I'm working on to that

[15:34:29 CDT(-0500)] <EricDalquist> for others to look at

[15:34:46 CDT(-0500)] <JoeMoore> Then yes, I think this is becoming clear enough so that will only take me a few minutes

[15:34:48 CDT(-0500)] <EricDalquist> and not bother with main repository with them until I merge the feature branch into master and push that

[15:34:52 CDT(-0500)] <EricDalquist> great (smile)

[15:34:57 CDT(-0500)] <EricDalquist> so go here https://github.com/Jasig/uPortal

[15:35:03 CDT(-0500)] <EricDalquist> and click that fork button in the upper right

[15:35:34 CDT(-0500)] <JoeMoore> yes, im there and logged in

[15:35:56 CDT(-0500)] <JoeMoore> I see my old clone that references your master from 7 months ago

[15:36:18 CDT(-0500)] <EricDalquist> great

[15:36:45 CDT(-0500)] <EricDalquist> so the first thing we'll do is in your local command line run "git remote rename origin upstream"

[15:37:00 CDT(-0500)] <EricDalquist> git remote names are free form but there are two conventions

[15:37:28 CDT(-0500)] <EricDalquist> origin - the name of the remote repository that you control (your fork)

[15:37:28 CDT(-0500)] <EricDalquist> upstream - the name of the remote repository which is the primary for the project

[15:38:09 CDT(-0500)] <JoeMoore> OK, that rename has run

[15:38:31 CDT(-0500)] <EricDalquist> now copy the ssh url from your fork on github

[15:38:34 CDT(-0500)] <EricDalquist> should look like "git@github.com:edalquist/uPortal.git"

[15:38:37 CDT(-0500)] <EricDalquist> but with your username

[15:39:07 CDT(-0500)] <EricDalquist> and do "git remote add origin git@github.com:edalquist/uPortal.git"

[15:39:42 CDT(-0500)] <JoeMoore> OK, it looks like it worked

[15:39:49 CDT(-0500)] <EricDalquist> now a "git remote -v" should look like:

[15:39:49 CDT(-0500)] <EricDalquist> origin git@github.com:edalquist/uPortal.git (fetch)

[15:39:49 CDT(-0500)] <EricDalquist> origin git@github.com:edalquist/uPortal.git (push)

[15:39:49 CDT(-0500)] <EricDalquist> upstream git@github.com:Jasig/uPortal.git (fetch)

[15:39:49 CDT(-0500)] <EricDalquist> upstream git@github.com:Jasig/uPortal.git (push)

[15:40:13 CDT(-0500)] <EricDalquist> well your upstream url(s) will be different since you don't have write access to Jasig/uPortal

[15:40:29 CDT(-0500)] <JoeMoore> Yup. All 4 lines match.

[15:40:34 CDT(-0500)] <EricDalquist> great

[15:40:43 CDT(-0500)] <EricDalquist> now try doing "git push origin"

[15:41:01 CDT(-0500)] <EricDalquist> that should push the latest commits in master to your fork

[15:41:39 CDT(-0500)] <JoeMoore> it needs to audit my fingerprint.

[15:41:55 CDT(-0500)] <JoeMoore> so ill go there quickly

[15:41:58 CDT(-0500)] <EricDalquist> ok

[15:43:15 CDT(-0500)] <JoeMoore> that was painless. it only listed one server and thats the exact one im working on.

[15:43:23 CDT(-0500)] <EricDalquist> great

[15:43:39 CDT(-0500)] <JoeMoore> it ran through 2938 objects and said its done

[15:43:55 CDT(-0500)] <JoeMoore> nope. 9346 objects

[15:44:01 CDT(-0500)] <JoeMoore> it compressed the first number

[15:44:07 CDT(-0500)] <EricDalquist> now if you go to your fork you should see that master there matches up with master in jasig/uPortal

[15:44:25 CDT(-0500)] <EricDalquist> the next question ... is there anything in your local commits on your branch off of 4.0.5 that is private?

[15:44:33 CDT(-0500)] <JoeMoore> authored 4 hours ago

[15:44:35 CDT(-0500)] <JoeMoore> perfect

[15:44:52 CDT(-0500)] <EricDalquist> because with the free account your fork is publicly visible

[15:44:53 CDT(-0500)] <JoeMoore> yes, there are some passwords

[15:44:57 CDT(-0500)] <EricDalquist> ok

[15:45:02 CDT(-0500)] <EricDalquist> so we can't do this next step

[15:45:08 CDT(-0500)] <EricDalquist> until you get yourself a private repository

[15:45:13 CDT(-0500)] <EricDalquist> either by paying github

[15:45:43 CDT(-0500)] <EricDalquist> or setting up some sort of local git hosting solution (a very simple local git host is a server you can ssh to that has git installed on it)

[15:46:07 CDT(-0500)] <JoeMoore> OK, Ill need to think about the pros and cons of that.

[15:46:09 CDT(-0500)] <EricDalquist> the next step if you have a private repo would be "git push origin your4.0.5branchname"

[15:46:43 CDT(-0500)] <EricDalquist> you need to do that to push a branch that only exists locally to a remote where the branch does not exist yet

[15:47:04 CDT(-0500)] <EricDalquist> after that "git push origin" will push changes to all branches that the remote knows about

[15:47:26 CDT(-0500)] <EricDalquist> also ... lets say 4.0.6 comes out tomorrow and you want to upgrade your branch to it

[15:47:34 CDT(-0500)] <JoeMoore> makes sense

[15:47:36 CDT(-0500)] <EricDalquist> you would do "git merge uportal-4.0.6"

[15:48:00 CDT(-0500)] <EricDalquist> that will take all the commits that have happened from 4.0.5 and 4.0.6 in the jasig/uportal/master branch

[15:48:04 CDT(-0500)] <EricDalquist> and merge them into your branch

[15:48:43 CDT(-0500)] <EricDalquist> I know that was a lot of stuff

[15:48:50 CDT(-0500)] <EricDalquist> but hopefully you're feeling a little better about git

[15:48:58 CDT(-0500)] <EricDalquist> I'm going through and updating our git workflow docs

[15:49:11 CDT(-0500)] <EricDalquist> and will try and clarify a bunch of stuff

[15:49:24 CDT(-0500)] <JoeMoore> so do those last statements about upgrading apply without pushing origin back?

[15:49:40 CDT(-0500)] <EricDalquist> yes

[15:50:03 CDT(-0500)] <EricDalquist> the only reason you would want to do the "git push origin yourbranch" is to have a shared location for the branch

[15:50:11 CDT(-0500)] <EricDalquist> like if another dev on your team wanted to work on that same branch

[15:50:14 CDT(-0500)] <EricDalquist> or you wanted a backup

[15:50:24 CDT(-0500)] <EricDalquist> if you're happy just working on your local repository

[15:50:31 CDT(-0500)] <EricDalquist> you don't need origin at all

[15:52:04 CDT(-0500)] <JoeMoore> I thought so. Thank you! I'm saving the pointer to this log. Now I'll go back and try to redo my ant commands against my pristine 4.0.5 with local changes after checking pom.xml in cas

[15:52:15 CDT(-0500)] <EricDalquist> sounds good

[15:52:23 CDT(-0500)] <EricDalquist> hopefully we can have better wiki docs before I go home today too (smile)

[16:02:05 CDT(-0500)] <peterjhart> EricDalquist: the SCSS builds fine for me. There are a few differences between the resulting portal.css and the portal.css in master. I can't look into it right now, though

  • No labels