now that release events are separate releases, looking up a disc id currently attached to a release with three release events will return three releases in ngs, right? or would it just return the track list and a list of releases the track list is used on?
2010-06-01 15248, 2010
aCiD2
nikki: disc ids are attached to mediums
2010-06-01 15258, 2010
aCiD2
and 3 release events creates 3 releases, but with shared mediums
2010-06-01 15206, 2010
aCiD2
oh wait... that's not right
2010-06-01 15207, 2010
nikki
mediums aren't shared, tracklists are
2010-06-01 15211, 2010
aCiD2
yea
2010-06-01 15239, 2010
Leftmost
A medium is just a release-tracklist relation with a couple bits of info, right?
2010-06-01 15242, 2010
aCiD2
I'm not sure how it works then i'm afraid, I'm guessing that the discid is attached to 3 mediums
2010-06-01 15245, 2010
nikki
Leftmost: yes
2010-06-01 15239, 2010
aCiD2
navap: nice work with the edit branch btw, I'm just merging it in now
2010-06-01 15241, 2010
aCiD2
sorry it took so long!
2010-06-01 15222, 2010
navap
woohoo!
2010-06-01 15232, 2010
aCiD2
Alright, it's in - if there are any bugs it fixes, please close them :)
2010-06-01 15242, 2010
navap
Did you merge it into core.git?
2010-06-01 15247, 2010
aCiD2
doing so now
2010-06-01 15248, 2010
navap
Or push it up rather
2010-06-01 15251, 2010
navap
Ah okay
2010-06-01 15255, 2010
aCiD2
ok, just merged and pushed to core.git
2010-06-01 15214, 2010
navap
wow that's a lot of merging
2010-06-01 15220, 2010
aCiD2
haha
2010-06-01 15224, 2010
aCiD2
well, I did merge 70 odd branches
2010-06-01 15252, 2010
navap
Can you also merge it/them into next?
2010-06-01 15211, 2010
aCiD2
on that too
2010-06-01 15234, 2010
aCiD2
then I gotta fix the commit emails for murdos, then it's gym time
2010-06-01 15235, 2010
nikki
when will we be able to see the converted edits?
2010-06-01 15216, 2010
aCiD2
nikki: still going to be a good 10 days for that I think
2010-06-01 15221, 2010
nikki
aww
2010-06-01 15232, 2010
aCiD2
but that's what I'll be working on now - I have to get the migration scripts running faster
I see my commits and test looks like it should, but I edited quite a few more files than that.
2010-06-01 15248, 2010
aCiD2
I think that's just how the merge commit is displayed - you want to see the stat of your merge against a certain point in history
2010-06-01 15252, 2010
aCiD2
but you can't do that in gitweb
2010-06-01 15244, 2010
aCiD2
those are only the changes that happened during that merge)
2010-06-01 15232, 2010
navap
So then what happens to all the other changes? Were they handled before that merge commit?
2010-06-01 15214, 2010
aCiD2
They were handled in your commits
2010-06-01 15215, 2010
aCiD2
in your branch
2010-06-01 15228, 2010
aCiD2
(if you follow one of the parent links, you'll see the history of your commits)
2010-06-01 15242, 2010
aCiD2
The thing with git is a merge isn't where the changes is happens, it just shows where 2 branches join together
2010-06-01 15208, 2010
navap
Yeah I think I understand that bit, but what I don't understand is why only those six files are being shown in the merge commit.
2010-06-01 15228, 2010
navap
I'd expect it to either be all the files, none of the files, or only files that required manually changing due to conflicts or something.
2010-06-01 15250, 2010
aCiD2
a merge commit would normally show no files at all, but in this case there are some changes in the merge commit from me fixing conflicts, and some changes that show up because I think they were changed in both branches (your branch, and the master branch)
2010-06-01 15259, 2010
aCiD2
(work/header.tt for example)
2010-06-01 15235, 2010
navap
So then wouldn't it be a conflict..which would make it be listed above in the conlflicts section?
2010-06-01 15236, 2010
aCiD2
so work/header.tt was changed in your branch, and in master after you started work. So the changes have to be merged, but they didn't conflict (so git merged them automatically)
2010-06-01 15254, 2010
navap
Oh.. that's kind of makes sense.
2010-06-01 15256, 2010
aCiD2
not necessarily, if they were changed in different places (which they were) that wouldn't create a conflict
2010-06-01 15200, 2010
navap
Yeah
2010-06-01 15238, 2010
pronik` joined the channel
2010-06-01 15224, 2010
pronik`` joined the channel
2010-06-01 15217, 2010
navap
I just encountered an error loading search/edits:
2010-06-01 15220, 2010
ruaok joined the channel
2010-06-01 15225, 2010
navap
Caught exception in MusicBrainz::Server::Controller::Edit->search "Couldn't load class (MusicBrainz::Server::Edit::Historic::AddRelease) because: Can't locate Devel/Dwarn.pm in @INC
2010-06-01 15240, 2010
navap
I manually installed Devel::Dwarn and the problem seemes to have gone away. Should Devel::Dwarn be in the MakeFile?
2010-06-01 15230, 2010
brianfrud_ joined the channel
2010-06-01 15255, 2010
outsidecontext_ joined the channel
2010-06-01 15230, 2010
avi| joined the channel
2010-06-01 15240, 2010
avi| has left the channel
2010-06-01 15255, 2010
outsidecontext_ joined the channel
2010-06-01 15240, 2010
Leftmost joined the channel
2010-06-01 15211, 2010
ruaok
nikki: ping
2010-06-01 15217, 2010
nikki
pong?
2010-06-01 15246, 2010
ruaok
at the music festival I went to this weekend, there was a fellow who invented and played an earth harp.
You've got the server running right, but no coding yet?
2010-06-01 15229, 2010
Leftmost
Right, though I've dug through the code and know what files I need to modify and how for my next week's goals.
2010-06-01 15250, 2010
aCiD2
Ok - and what are those?
2010-06-01 15254, 2010
aCiD2
Well
2010-06-01 15259, 2010
aCiD2
in which order are you tackling them
2010-06-01 15237, 2010
brianfrud_ joined the channel
2010-06-01 15213, 2010
Leftmost
Well, I think probably the first thing to do is make the changes I need to the schema, then create a simple page that gathers together an editor's collections, so I'll need a new controller class and data access module. (Something like /user/editor-collections/EDITOR_NAME.)
2010-06-01 15242, 2010
Leftmost
Then I can make the modifications to the collection page so that it works based on a collection ID.
2010-06-01 15213, 2010
aCiD2
Ok
2010-06-01 15245, 2010
aCiD2
So what we'll need here then is modifications to admin/sql/CreateTables.sql, but also a admin/sql/updates/collections-yyyy-mm-dd.sql script with ALTER statements in
2010-06-01 15216, 2010
Leftmost
Ahh, I was going to ask about that. I knew I'd have to mess with CreateTables, but I wasn't sure about how to alter existing structure.
2010-06-01 15248, 2010
aCiD2
Yea, we don't really have a system in structure for it
2010-06-01 15257, 2010
aCiD2
But the admin/sql/update scripts are the best way for now
2010-06-01 15224, 2010
warp joined the channel
2010-06-01 15202, 2010
Leftmost
One thing that I think will need some work is UIs. I think most of it will be pretty straightforward, but there are some specific things I'll probably want to get feedback from a few people on.
2010-06-01 15222, 2010
navap
aCiD2: Does Devel::Dwarn needs to be added to MakeFile.PL?
2010-06-01 15231, 2010
aCiD2
No, it needs to be removed from the code
2010-06-01 15232, 2010
aCiD2
sorry about that
2010-06-01 15251, 2010
nikki
how come it keeps getting re-added?
2010-06-01 15258, 2010
trojaneel joined the channel
2010-06-01 15209, 2010
aCiD2
because I use it for debugging
2010-06-01 15217, 2010
aCiD2
and sometimes I forget to remove it
2010-06-01 15223, 2010
nikki
tsk tsk :P
2010-06-01 15224, 2010
navap
tsk tsk
2010-06-01 15226, 2010
aCiD2
exactly :P
2010-06-01 15216, 2010
navap
How about
2010-06-01 15217, 2010
navap
Caught exception in MusicBrainz::Server::Controller::Edit->search "Attribute (data) does not pass the type constraint because: Validation failed for 'MooseX::Types::Structured::Dict[types,MooseX::Types::Structured::Tuple[Str,Str],name,Str,link_phrase,Str,reverse_link_phrase,Str,description,Str,attributes,ArrayRef[MooseX::Types::Structured::Dict[name,Str,min,Int,max,Int]]]' failed with value { new_version: 40453, old
2010-06-01 15258, 2010
navap
I think that was when I pressed the button to search for edits.
2010-06-01 15237, 2010
trojaneel_ joined the channel
2010-06-01 15256, 2010
aCiD2
on what server?
2010-06-01 15200, 2010
aCiD2
you'll probably have to clear your edit table
2010-06-01 15201, 2010
navap
Mine
2010-06-01 15210, 2010
navap
aw
2010-06-01 15214, 2010
navap
Okay
2010-06-01 15220, 2010
aCiD2
yea, some edits probably changed :(
2010-06-01 15253, 2010
navap
Is there a set of test edits that can be easily loaded into the database?
