Re: [udig-devel] uDig Repo Migration IRC Log

[Jesse Eichar <jesse.eichar@xxxxxxxxxxxxxx>]

Oh shoot.
  Here 's the right one:  Looks like I lost about 5 minutes at the end
but it is mostly there


  [2009-06-18 08::57:15] Jesse_Eichar: brb

  [2009-06-18 08::59:53] » tupi joined the chat room.

  [2009-06-18 09::00:41] » moovida joined the chat room.

  [2009-06-18 09::03:23] tupi: kick off, moovida!

  [2009-06-18 09::03:39] moovida: hi tupi!

  [2009-06-18 09::03:50] tupi: bongiorno!

  [2009-06-18 09::04:02] moovida: buongiorno a tutti!

  [2009-06-18 09::04:16] Jesse_Eichar: back

  [2009-06-18 09::04:37] moovida: morning master Jesse, ready for
hungry developers? :D

  [2009-06-18 09::04:39] Jesse_Eichar: jody's not here yet but we
can't wait too long for him

  [2009-06-18 09::05:08] moovida: yeah, we should start

  [2009-06-18 09::05:19] Jesse_Eichar: ok

  [2009-06-18 09::07:26] moovida: thinks that this might be a good
moment to do so

  [2009-06-18 09::07:49] Jesse_Eichar: I have put trunk on GitHub in
my own account

  [2009-06-18 09::07:54] moovida: are we going to migrate all of it or
starting from scratch with the trunk?

  [2009-06-18 09::08:08] Jesse_Eichar: that is part of topic 1

  [2009-06-18 09::08:17] moovida: :) sorry

  [2009-06-18 09::08:39] Jesse_Eichar: so I will outline the idea I
have and then feel free to criticise call me crazy or tell me I'm
brilliant :)

  [2009-06-18 09::08:54] moovida: is on his first heavy metal
migration partecipation

  [2009-06-18 09::09:12] Jesse_Eichar: So GIT has a slightly different
philosophy than Subversion.

  [2009-06-18 09::09:49] » kartben joined the chat room.

  [2009-06-18 09::10:01] Jesse_Eichar: so I am thinking of creating a
uDig Github account with all the PMC as administrators

  [2009-06-18 09::12:24] » jgarnett joined the chat room.

  [2009-06-18 09::12:31] jgarnett: hi guys

  [2009-06-18 09::12:32] Jesse_Eichar: I will also have a repo which
is the original uDig trunk with out any of these changes for
completeness

  [2009-06-18 09::12:38] jgarnett: I am still working madly :-(

  [2009-06-18 09::12:39] Jesse_Eichar: Hi jody we are well in to the meeting

  [2009-06-18 09::12:44] jgarnett: so I will not be able to add much

  [2009-06-18 09::13:03] Jesse_Eichar: I am outlining my plan. Let me
bundle it up and email it to you

  [2009-06-18 09::13:04] jgarnett: (remember to email the logs; rather
then post to the blog)

  [2009-06-18 09::13:56] Jesse_Eichar: ok sent to your gmail account

  [2009-06-18 09::14:13] jgarnett: thanks

  [2009-06-18 09::14:28] Jesse_Eichar: moovida. Comments up to now?

  [2009-06-18 09::14:51] jgarnett: I do not have much to add; I am
flat out so any change to things is going to annoy me; but if this
will help others play I will try and catch up :-)

  [2009-06-18 09::15:08] moovida: I think it is ok up to now

  [2009-06-18 09::16:01] Jesse_Eichar: You have 3 options that I see

  [2009-06-18 09::16:03] moovida: I would like to have JGrass very
near to udig, always nearer :)

  [2009-06-18 09::16:19] Jesse_Eichar: 1. add it as a repo in your
private account

  [2009-06-18 09::16:54] moovida: yes, that is my favourite one

  [2009-06-18 09::17:39] Jesse_Eichar: No that is the difference I was
talking about

  [2009-06-18 09::19:02] jgarnett: thinking

  [2009-06-18 09::19:14] moovida: that sounds quite clean to me

  [2009-06-18 09::19:16] jgarnett: I kind of like community for
getting people involved; and also reviewing their work.

  [2009-06-18 09::19:28] Jesse_Eichar: The uDig project is the community

  [2009-06-18 09::21:04] moovida: O like that, we should also provide
a small first steps guide on how to create a repo in a "udig standard"
way

  [2009-06-18 09::21:17] Jesse_Eichar: there is no uDig standard way

  [2009-06-18 09::21:30] moovida: which means?

  [2009-06-18 09::21:31] Jesse_Eichar: or I should say github way

  [2009-06-18 09::22:19] tupi: Question?

  [2009-06-18 09::22:24] Jesse_Eichar: sure

  [2009-06-18 09::22:39] moovida: Jesse_Eichar: that sounds ok for me

  [2009-06-18 09::22:50] tupi: has anyone checked the git plugin for
eclipse out?

  [2009-06-18 09::22:54] Jesse_Eichar: I have

  [2009-06-18 09::23:04] jgarnett: question

  [2009-06-18 09::23:25] Jesse_Eichar: It works fine but not all
functionality that git provides is available

  [2009-06-18 09::23:35] jgarnett: - the crucial thing for me here -
is not the choice of tech (I am happy with something that works); and
can use the command line

  [2009-06-18 09::23:37] tupi: It's productive, and it supports the
scheme your're planning?

  [2009-06-18 09::23:41] jgarnett: - but updating our instructions and docs

  [2009-06-18 09::24:20] Jesse_Eichar: tupi, yes it is fine. The
weaknesses come in when you want to do some non-standard operations,
which you will want to do at some point.

  [2009-06-18 09::24:57] tupi: Me? not really, I leave that to you guys ;-)

  [2009-06-18 09::25:36] Jesse_Eichar: Well you might own your own
project repo tupi. So you may find yourself tagging. And branching is
ALWAYS done in git

  [2009-06-18 09::26:51] moovida: +1 from me. The rough plan is cool.
I will have to study :)

  [2009-06-18 09::27:03] jgarnett: up can we put the rough plan on a
google doc or wiki page?

  [2009-06-18 09::27:12] Jesse_Eichar: sure

  [2009-06-18 09::27:29] jgarnett:
http://udig.refractions.net/confluence/display/HACK/Ideas

  [2009-06-18 09::27:42] Jesse_Eichar: ok will do after meeting

  [2009-06-18 09::27:43] jgarnett: can you ping me when page is
created; I will review and ask questions

  [2009-06-18 09::27:46] Jesse_Eichar: ok

  [2009-06-18 09::28:19] jgarnett: hrm; wiki page with links would be
good for this tutorial

  [2009-06-18 09::28:23] Jesse_Eichar: no

  [2009-06-18 09::28:25] jgarnett: cause I do not have it installed yet

  [2009-06-18 09::28:29] Jesse_Eichar: 1 link:

  [2009-06-18 09::29:22] jgarnett: okay

  [2009-06-18 09::29:32] Jesse_Eichar: also:http://gitready.com/

  [2009-06-18 09::29:36] jgarnett: hrm; I would like to go through a
udig check out with git

  [2009-06-18 09::29:39] Jesse_Eichar: I will put these 2 on the wiki page

  [2009-06-18 09::29:46] jgarnett: and a simple change / commit

  [2009-06-18 09::30:03] Jesse_Eichar: ok I will do a mock scenario right now

  [2009-06-18 09::30:03] jgarnett: can we do that in IRC now?

  [2009-06-18 09::30:07] Jesse_Eichar: sure

  [2009-06-18 09::30:14] jgarnett: let me download ...

  [2009-06-18 09::30:20] Jesse_Eichar: oh

  [2009-06-18 09::31:24] moovida: ready to rumble

  [2009-06-18 09::31:52] Jesse_Eichar: :)

  [2009-06-18 09::31:53] jgarnett: yeah I want to actually try this if
we are going to consider voting on it

  [2009-06-18 09::31:59] Jesse_Eichar: for sure taht

  [2009-06-18 09::32:03] jgarnett: would you like to do up the wiki
page while I install?

  [2009-06-18 09::32:07] Jesse_Eichar: ok let me know when you have
git installed

  [2009-06-18 09::32:18] moovida: has git

  [2009-06-18 09::33:08] Jesse_Eichar: ummmm

  [2009-06-18 09::33:55] moovida: now that you mention user and
passwd, guess we don't need to have an account for checking out,
right?

  [2009-06-18 09::34:18] jgarnett: question - add Git Bash Here and
Add Git GUI here?

  [2009-06-18 09::35:25] Jesse_Eichar: the defaults are fine

  [2009-06-18 09::35:30] jgarnett: and assumes cygwin

  [2009-06-18 09::36:00] Jesse_Eichar: did you download>
http://code.google.com/p/msysgit/

  [2009-06-18 09::36:10] jgarnett: the deafult wasyes

  [2009-06-18 09::36:45] Jesse_Eichar: ok dont download the mysgit

  [2009-06-18 09::37:19] jgarnett: do not understand

  [2009-06-18 09::37:40] Jesse_Eichar: I installed it at home without cygwin

  [2009-06-18 09::37:46] jgarnett: hrm

  [2009-06-18 09::37:47] Jesse_Eichar: they are good

  [2009-06-18 09::38:03] jgarnett: instructions say: Download the
latest installer from Google code and run it. To avoid path conflicts,
pick the “Use Git Bash only” setting during the installation.

  [2009-06-18 09::38:23] Jesse_Eichar: I was just going to say that

  [2009-06-18 09::39:19] jgarnett: instructions and defaults say
different things ...

  [2009-06-18 09::40:53] Jesse_Eichar: eclipse git

  [2009-06-18 09::41:15] jgarnett: so we have a dependency on PuTTY
for installation

  [2009-06-18 09::41:25] Jesse_Eichar: for ssh

  [2009-06-18 09::43:21] jgarnett: okay; I have GIT - and it seems to
have included Git Bash

  [2009-06-18 09::43:34] Jesse_Eichar: ok

  [2009-06-18 09::43:42] jgarnett: no frigging way

  [2009-06-18 09::44:10] Jesse_Eichar: ok this is good feedback

  [2009-06-18 09::44:20] jgarnett: nope that breaks windows find

  [2009-06-18 09::44:54] Jesse_Eichar: what is it that is causing you issues?

  [2009-06-18 09::45:45] jgarnett: that it is bash

  [2009-06-18 09::46:06] Jesse_Eichar: egit will work fine

  [2009-06-18 09::46:07] jgarnett: in a training course

  [2009-06-18 09::46:11] Jesse_Eichar: you install egit

  [2009-06-18 09::46:28] jgarnett: there is also a Git Gui included
here that may work

  [2009-06-18 09::46:32] Jesse_Eichar: you need putty if you are going
to actually push cahnges to the uDig codebase

  [2009-06-18 09::46:48] jgarnett: can we avoid putty if they are just
checking out code?

  [2009-06-18 09::46:52] Jesse_Eichar: yes

  [2009-06-18 09::47:14] jgarnett: hrm; these SSH keys are also a bit
more madness then I would prefer; since we need to get into the Git
bash to generate them

  [2009-06-18 09::47:17] Jesse_Eichar: we dont even need that msysGit
that you just installed as far as I understand

  [2009-06-18 09::47:22] jgarnett: but I assume they are only needed for commit

  [2009-06-18 09::48:09] Jesse_Eichar: sure

  [2009-06-18 09::48:12] jgarnett: I have git installed; and Git gui open

  [2009-06-18 09::48:21] Jesse_Eichar: I am more comfortable with commandline

  [2009-06-18 09::48:25] jgarnett: what should I install

  [2009-06-18 09::48:27] Jesse_Eichar: I have never used git gui

  [2009-06-18 09::48:32] jgarnett: thinking

  [2009-06-18 09::48:37] Jesse_Eichar: but I can try walking through
it because I have it installed I beleive

  [2009-06-18 09::48:43] jgarnett: I do not mind doing a check out
with the command line for us developers here

  [2009-06-18 09::48:53] Jesse_Eichar: yes lets stick to commandline

  [2009-06-18 09::48:59] jgarnett: but it is not acceptable for our
instructions at the end of the day

  [2009-06-18 09::49:02] Jesse_Eichar: and I will post walkthroughs for egit

  [2009-06-18 09::49:19] jgarnett: question: egit is an eclipse plugin?

  [2009-06-18 09::49:22] Jesse_Eichar: yes

  [2009-06-18 09::49:57] jgarnett: I will try installing that now I guess

  [2009-06-18 09::50:01] Jesse_Eichar: no please

  [2009-06-18 09::50:04] jgarnett: but we can proceed with the command
line if you like ...

  [2009-06-18 09::50:08] Jesse_Eichar: I will do this when we have time

  [2009-06-18 09::51:38] moovida: ready

  [2009-06-18 09::51:51] jgarnett: check

  [2009-06-18 09::51:53] Jesse_Eichar: ok

  [2009-06-18 09::52:58] moovida: ready

  [2009-06-18 09::53:04] jgarnett: it is working on it now

  [2009-06-18 09::53:22] Jesse_Eichar: I am worried about your install jody

  [2009-06-18 09::53:44] jgarnett: git shows up okay on my normal cmd prompt

  [2009-06-18 09::53:46] Jesse_Eichar: I did in on XP and it was a
breeze but your install sounded slightly different from when I did it

  [2009-06-18 09::54:01] jgarnett: I followed the directions; I was
just worried by the notes under the different options

  [2009-06-18 09::54:08] Jesse_Eichar: could be

  [2009-06-18 09::54:10] jgarnett: that said they were going to put a unix find

  [2009-06-18 09::54:25] Jesse_Eichar: I read them

  [2009-06-18 09::54:48] jgarnett: I am trying again

  [2009-06-18 09::54:48] » mauricio joined the chat room.

  [2009-06-18 09::54:56] jgarnett: but I am worried I am behind a
firewall or something?

  [2009-06-18 09::55:11] » mauricio is now known as Guest61741.

  [2009-06-18 09::55:14] Jesse_Eichar: if it fails then you can just
create a repo and pretend it is a clone

  [2009-06-18 09::55:16] jgarnett: C:\java\test>git clone
git://github.com/jesseeichar/maven-scala-skin.git

  [2009-06-18 09::55:34] Jesse_Eichar: ok I think it requires putty then for ssh

  [2009-06-18 09::56:46] jgarnett: trying from the bsh

  [2009-06-18 09::57:34] Jesse_Eichar: ok

  [2009-06-18 09::58:42] moovida: gulp

  [2009-06-18 09::58:53] Jesse_Eichar: :) no biggy moovida

  [2009-06-18 09::59:09] moovida: I run this outside of the repo?

  [2009-06-18 09::59:17] Jesse_Eichar: oops not add

  [2009-06-18 09::59:53] moovida: ah, ok, it was complaining calling
me fat boy :)

  [2009-06-18 10::00:12] » Guest61741 is now known as mauricio_.

  [2009-06-18 10::00:25] Jesse_Eichar: it created a new branch called info_file

  [2009-06-18 10::00:41] » mauricio_ is now known as Guest85442.

  [2009-06-18 10::00:44] Jesse_Eichar: it says:

  [2009-06-18 10::00:47] moovida: coooool

  [2009-06-18 10::00:52] Jesse_Eichar: # On branch info_file

  [2009-06-18 10::02:16] moovida: ok

  [2009-06-18 10::02:17] Jesse_Eichar: close gitk and create a new file

  [2009-06-18 10::03:18] moovida: nice, it has always some help on
what you might want to do next

  [2009-06-18 10::03:27] Jesse_Eichar: you can see that there is a new file

  [2009-06-18 10::03:50] moovida: have to add first, right

  [2009-06-18 10::03:55] Jesse_Eichar: right thanks :)

  [2009-06-18 10::04:56] jgarnett:
(aside:http://udig.refractions.net/confluence/display/HACK/GIT+Windows+Install)

  [2009-06-18 10::05:08] Jesse_Eichar: so if you decide that you need
to update that file you can and then update the comit

  [2009-06-18 10::06:07] jgarnett: (note: I could not follow along
"you are on a branch yet to be born")

  [2009-06-18 10::06:19] Jesse_Eichar: ah right jody

  [2009-06-18 10::07:48] jgarnett: I am on no branch

  [2009-06-18 10::08:07] Jesse_Eichar: ok then create a file and commit it

  [2009-06-18 10::08:15] jgarnett: C:\java\test\new>git status

  [2009-06-18 10::08:16] Jesse_Eichar: let me do it too

  [2009-06-18 10::08:18] jgarnett: # (use "git rm --cached <file>..."
to unstage)

  [2009-06-18 10::08:42] Jesse_Eichar: you will need to do

  [2009-06-18 10::08:51] jgarnett: yep

  [2009-06-18 10::08:59] Jesse_Eichar: right

  [2009-06-18 10::09:16] jgarnett: C:\java\test\new>git status

  [2009-06-18 10::09:27] Jesse_Eichar: ok

  [2009-06-18 10::10:15] jgarnett: hrm; I have to "add" each time;
specifically adding things into my commit

  [2009-06-18 10::10:22] Jesse_Eichar: no

  [2009-06-18 10::10:44] jgarnett: okay; I am on a branch now

  [2009-06-18 10::10:44] Jesse_Eichar: git commit -am "message"

  [2009-06-18 10::11:18] moovida: Jesse_Eichar: in that case it takes
all new files it finds and adds them?

  [2009-06-18 10::11:25] jgarnett: understood

  [2009-06-18 10::11:28] Jesse_Eichar: moovida

  [2009-06-18 10::13:14] moovida: ok, that sounds good

  [2009-06-18 10::13:15] Jesse_Eichar: and push that

  [2009-06-18 10::13:34] moovida: I was just wondering about the -a in
git commit -am "message"? It adds the files automatically to the
staging area?

  [2009-06-18 10::13:57] Jesse_Eichar: the -a adds all *changed* (not
new) files to the staging area

  [2009-06-18 10::14:12] moovida: ahh, the short for amend

  [2009-06-18 10::14:28] Jesse_Eichar: git add -A

  [2009-06-18 10::15:25] jgarnett: jesse: after my install git seems
to be available just fine from the command line

  [2009-06-18 10::15:47] Guest85442: hello

  [2009-06-18 10::15:48] Jesse_Eichar: jgarnett maybe putty is missing
or some firewall

  [2009-06-18 10::15:58] » Guest85442 is now known as mauricio__.

  [2009-06-18 10::16:05] mauricio__: yes

  [2009-06-18 10::16:39] Jesse_Eichar: sure

  [2009-06-18 10::16:53] jgarnett: Putty is installed; but I did not
personally install it (this machine is new work machine for me)

  [2009-06-18 10::17:02] mauricio__: how many repositories there is today?

  [2009-06-18 10::17:08] jgarnett: so far I am finding this a littler
slower to pick up then bzr

  [2009-06-18 10::17:48] Jesse_Eichar: I used bzr for 6 months and now
much prefer git because it is more powerful.

  [2009-06-18 10::17:50] jgarnett: and we all agree about the
documentation side of things :-)

  [2009-06-18 10::18:10] Jesse_Eichar: Staging area is one

  [2009-06-18 10::18:10] jgarnett: they have a similar workflow do they not?

  [2009-06-18 10::18:15] Jesse_Eichar: they do

  [2009-06-18 10::18:19] jgarnett: thinking about that

  [2009-06-18 10::18:24] Jesse_Eichar: but git is more layered

  [2009-06-18 10::20:04] mauricio__: that are good features

  [2009-06-18 10::20:19] Jesse_Eichar: you can ignore changes to files
that are actually in the repository but change during development.

  [2009-06-18 10::21:13] » kartben1 joined the chat room.

  [2009-06-18 10::21:14] Jesse_Eichar: ?

  [2009-06-18 10::21:36] » kartben left the chat room.

  [2009-06-18 10::22:01] Jesse_Eichar: anyhow moving along

  [2009-06-18 10::22:13] moovida: Jesse_Eichar: you were taking about amend

  [2009-06-18 10::22:20] Jesse_Eichar: oh right sorry

  [2009-06-18 10::22:22] moovida: else just go on

  [2009-06-18 10::22:38] Jesse_Eichar: we can quickly finish about amend

  [2009-06-18 10::22:50] moovida: ok

  [2009-06-18 10::22:55] Jesse_Eichar: quick summary of what I have done.

  [2009-06-18 10::23:57] moovida: you mean: updated the local file
with my last changes?

  [2009-06-18 10::24:16] Jesse_Eichar: git commit -a --amend

  [2009-06-18 10::24:38] moovida: hold on

  [2009-06-18 10::25:21] Jesse_Eichar: what was the command you used for amend?

  [2009-06-18 10::25:32] moovida: git commit --amend

  [2009-06-18 10::25:41] Jesse_Eichar: ah you need a -a as well

  [2009-06-18 10::26:06] » tupi_ joined the chat room.

  [2009-06-18 10::26:09] moovida: aha, let me do that then

  [2009-06-18 10::26:16] Jesse_Eichar: 1. You added the file

  [2009-06-18 10::26:43] » tupi_ left the chat room.

  [2009-06-18 10::26:55] moovida: yes, would be tempted to

  [2009-06-18 10::27:18] Jesse_Eichar: but that would have made 2
commits in the log when really it is only one change so it may as well
just be one commit in the log (keeping the log cleaner)

  [2009-06-18 10::27:58] moovida: aha, now I remember back your
previous explanation and better understand it :)

  [2009-06-18 10::27:59] Jesse_Eichar: nothing pushed to the server so
you can hack your commits all you want

  [2009-06-18 10::28:03] moovida: cool

  [2009-06-18 10::28:05] Jesse_Eichar: including changing the commit message

  [2009-06-18 10::28:38] moovida: ok

  [2009-06-18 10::28:59] Jesse_Eichar: lets go back to trunk

  [2009-06-18 10::31:12] moovida: so you would connect to me as server, right

  [2009-06-18 10::31:22] Jesse_Eichar: right there is a command for that

  [2009-06-18 10::33:26] moovida: define change

  [2009-06-18 10::33:48] Jesse_Eichar: anything. Add a file, update a
file, fix a spelling mistake

  [2009-06-18 10::33:50] moovida: or... what?

  [2009-06-18 10::33:52] Jesse_Eichar: :)

  [2009-06-18 10::34:03] moovida: oh, all of those

  [2009-06-18 10::34:06] Jesse_Eichar: change to the codebase

  [2009-06-18 10::35:39] moovida: thanks for that intro Jesse_Eichar

  [2009-06-18 10::35:44] Jesse_Eichar: want another meeting?

  [2009-06-18 10::35:45] moovida: how do we move on?

  [2009-06-18 10::35:55] Jesse_Eichar: ok so I will get repos up on github

  [2009-06-18 10::36:14] moovida: we will need one to define if we
want and in case the steps to follow

  [2009-06-18 10::36:34] Jesse_Eichar: I am writing a page with the plan

  [2009-06-18 10::36:49] jgarnett: hi jesse

  [2009-06-18 10::36:57] Jesse_Eichar: it is
http://udig.refractions.net/confluence/display/HACK/Migrate+To+GIT

  [2009-06-18 10::37:00] jgarnett: I would like another meeting when
we have the page in place

  [2009-06-18 10::37:05] Jesse_Eichar: ok

  [2009-06-18 10::37:15] jgarnett: you saw my page of screen snaps for install

  [2009-06-18 14::27:10] » kartben left the chat room.