#musicbrainz-devel

hmm

aCiD2: just had a huge talk with my manager

he gave me some ideas, we should talk some time

(preferably not while i'm still at work...)

alastairp: try and catch me tomorrow some time... or just shoot me and email and talk there :)

sweet

nikki: is it ok to name you by your full name in the annual report?

bah

no

nikki: I'm quite impressed that no one seems to know your full name

that's quite a feat these days

hehe

well I only use my surname on official stuff anyway, so it's not that surprising to me

but the common case these days seems to be a 10yr old signs up to facebook and it asks for their name, so they put it in

I did something similar when I first made it onto the net

yeah

would you expect the disc ids or details tab for http://musicbrainz.org/show/release/details.htm... ?

hi ruaok

I'd rather you didn't

(regarding surname, that is)

Nikki S? just Nikki?

just nikki :)

lower case?

"Nikki" is fine

;-)

\ø/

I downloaded the closedmods dump and extracted all the mb urls, gave me plenty to work with

and did the same for annotations

cool

the urls from the edit notes I mean

who hoo! a new pretty lights EP!

navap: github. yay!

Yeah I'm quite thrilled.

so, that's what - clone from git.mb then push? :-P

Yeah

Is there a direct git.mb>github method?

no

Okay phew :)

I talked to the github guys about it a few months ago, but they didn't seem interested

So I managed to create a branch, edit a file, and also merge that branch back in.

But I just realized that it didn't record the commiter properly.

So... what are my options?

you need to set some prefs

Yeah I set them.

oh,

now you want to undo?

I had them set earlier as well, but I just reinstalled Windows and reinstalled git just now.

have you pushed?

Not after doing the merge.

OK, cool

yes you can, then you just recommit

can't remember what you want

I've done something like this before

So I need to revert my commit?

yes

if there was just one commit you could have commit --ammended

but the merge would have been a commit too, so you need to undo both

git revert HEAD^2 might be what you want

I'm using tortoisegit, and when I try and revert I get an empty dialog with three columns: path, text status, property status.

sorry, I'm not very familiar with reverting, and not at all with graphical tools

Well I have a command prompt open as well where I can type git stuff in.

right

I'm asking smart people now. but aCiD2 should be able to let you know... when he wakes up :-P

I could also just start all over. Is it possible to remove a branch?

All it was was a one line change :p

navap: yep

git branch -d <name>

IIRC

Okay so it's deleted. Now on github I still have master and the now-deleted branch.

If I push will it delete that branch?

I think you need to push the deleted branch

git push origin mybranch

Even though the branch doesn't exist locally anymore?

Yeah that failed

hmm, interesting

yeah

ah, git reflog

that's what I've used before

Yes, I named it my-cool-feature :)

sorry - I'm clutching at straws here :(

aha http://github.com/guides/remove-a-remote-branch

I added the colon and it deleted the remote branch

ah, sweet

OK, people tell me it's git reset that you want

So now my local master branch has the modified file, I just pulled from git.mb and it said already up-to-date.

So how would I force pull or something like that?

you want to put the file back to what's on git.mb?

Yes

so git status shows it as modified?

on the file

git status doesn't list anything because I already commited that change (I think that's how it works?)

It does say that I'm ahead by 1 commit.

oh, it's committed on your branch but not on the one from git.mb?

I'm on master now, remember I merged the two brnaches locally.

So my master now has the modified file.

and now you want to..?

hmm actually..nothing :)

Oh right, that commit was by unknown

bleh, I'll just restart the process.

:-P

check it: http://www.flickr.com/photos/mayhem/4403152760/

Only 1 slot left! Or is it 2? What's with the mysteriously expanding search server?

1 slot left.

the other slot has the switch in it , facing backwards

and those search servers are total pitas.

donated boxes that we reboot twice a week on schedule and they *still* crash a few times a month.

thats 4U of suck.

So one slot needs to be kept empty for the two cables to go to the back?

if Ihad $3k spare I'd replace them with 2 1U dells.

no, I could route those via where the switch goes.

I'm still sorely tempted to buy a new server for the DB migration when we release NGS.

have one server to serve out the read-only traffic to keep the site up.

then the main DB can be tuned and started on the NGS upgrade script.

in theory the NGS switch that way could be: normal -> read only -> NGS

with instant switchovers.

That wound be really nice.

would*

yeah, and the server could be used later for other stuff.

like replacing those crappy search servers.

How long would the transition take?

but I could do that cheaper.

if we finish the script to port all the edits... 2-3 hours.

That's not really too bad, even if you did take the site down for that time period.

What about pending edits?

but, we may keep the site in read only mode just to do some maint on other boxes.

thats still an open question.

Read only for 14 days would be quite sucky.

we most likely need to shut off new edits a few days ahead of time and then do a massive call to vote to close out as many edits as possible.

2 days ought to do it.

and really, if we all get busy voting, how long can it take?

And then just accept left over edits?

reject

Okay

we should simply tell people that for 2 weeks prior that if they want to make serious or contentious edits to wait.

I was just about to suggest that.