#musicbrainz

alastairp: how do you switch between local branches in git?

git stash

git checkout -b branch

I think

thats to create a new branch.

oops. no.

git branch something?

ok, i'm a retard, i'm not late at all lol

need to stash if you have local changes that you haven't commiteed

there's a decent man at http://www.kernel.org/pub/software/scm/git/docs...

git checkout branch

no -b

right

ask aCiD2

loi

brianfreud, one thing we're planning on doing is abstracting away the mp3/flac stuff some more, so then it would be easy to write a ogg version too.

nice :)

(even easier, since IIRC flac and ogg use the same tagging system)

git-stash is cool

it is :)

should look at warp's collections script - he did a nice job separating type from function

did you get svn checkouts working?

no. I'm at r11136

and what's happening?

svn is r11141

git-svn fetch says nothing

git svn rebase ?

fetch doesn't merge with svn head

it just fetchs it, ready for rebasing to

ah.

that worked.

cool :)

funny, I'd done both commands before...

thx

odd

also ruaok, if you're using git, you might want to add my branch on github as a remote

got command?

yea, but you need to check something, cause my browser is pooped, heh

git remote add acid <url on his github>

`git remote add http://public-clone-url-for-my-repo`

lol

oh yea, give it a name, listen to alastairp :)

yeah

what he said

brianfreud: got repo URL ?

my browsers refusing to actually do anything >.>

ruaok: go to the repo on github

it gives you the fork url

maybe without the .git

no, don't use brians :P

ta

lol

no.. that's brians >.<

:P

when it rains, it pours!

when you do that you can do `git fetch acid` and all my work in git will be pulled to your machine, into a branch

might be nice to sketch ideas out, but not commit to svn, who knows

aCiD2: can anyone commit back to svn?

if you svn privs

have..

sure

don't worry, you're not quite there yet :)

ok, done with git fetch

do I need to rebase?

if I want to go to your branch?

probably not

don't think so

if you want to go by `git branch -r`

git branch will show all branches

then `git chekout branch`

only shows mine

aCiD2: did you see my message about waiting to merge?

and you merge branches with.... git merge?

alastairp: or pull

it has some paramaters

but it should show my branch in git branch... erm, how'd I do this at home..

cool, the git protocol won't work over wireless uni connection, hum

that sucks

git:// ?

or http:// ?

git://

aCiD2: git branch -a

shows both local and remote brances

branches

ok, git is hardc-core sexy.

geekily speaking, of course

very nice :)

ok, enough for today. nap time.

nn!

that's the first time I've seen git being called sexy :P

pfft, the soundsmith commercial wasn't *that* bad

i've seen worse

it was lame

but not the worst i've seen

Yeah, but you live in Norway where your standard TV is much worse.

It can't be worse than here.

They all speak /foreign/ there. ¬_¬

It's norse, not worse ;-)

brianfreud: I did yea

luks: i think git's sexy too :)

so there's the second time, heh

and CatCat i was cringing all the way through that soundsmith commercial it is baaaad :P

Doing it right.

Hrm, any idea how to display the title of the active window in screen as my titlebar, when running through ssh?

Terminal just displays 'ssh' instead of the window title :(

Did I ever tell you about my drinking problem?

Splosh.

aCiD2: #screen might have the answer.

aCiD2: ^a:hardstatus lastline

google seems to have some stuff too

FauxFaux: eh, I don't really want the status bar

Wait, no, that's for the... hardstatus as the title, which isn'tw hat you want.

lol

Clearly ou need more tabs.

Johnny Five is Alive! :D

LOL! I so called it that someone would be asking for VCD and SVCD :P http://bugs.musicbrainz.org/ticket/4615