error: Untracked working tree file 'carton.lock' would be overwritten by merge.
2012-01-21 02106, 2012
navap
huh?
2012-01-21 02121, 2012
kepstin
sounds like someone accidentally checked in carton.lock :/
2012-01-21 02129, 2012
warp
navap: carton.lock is automatically generated by Carton, but it is also part of our git repository.
2012-01-21 02150, 2012
warp
kepstin: no, intentionally! that has the exact versions we want, so it should be checked in.
2012-01-21 02159, 2012
warp
navap: you can safely remove it.
2012-01-21 02105, 2012
navap
What happens when we do local installs?
2012-01-21 02125, 2012
warp
local installs?
2012-01-21 02150, 2012
navap
I installed XML::Feed with carton earlier today because I checkouted a really old branch that required that
2012-01-21 02103, 2012
navap
I presume that's when the carton.lock was created
2012-01-21 02107, 2012
warp
navap: with "carton install XML::Feed" ?
2012-01-21 02111, 2012
navap
Yes
2012-01-21 02126, 2012
navap
I was following the instructions in the ~/README
2012-01-21 02130, 2012
warp
navap: that's fine, that shouldn't cause problems.
2012-01-21 02159, 2012
warp
carton has an uninstall command, which is slow but should work in theory. and otherwise it's easy to start over.
2012-01-21 02137, 2012
warp
but a few extra packages shouldn't have any effect on the server.
2012-01-21 02136, 2012
navap
So it seems a recent commit to master is what's causing my collate issues. If I checkout a branch from a few days ago on xpc I don't get collate problems, I do when I checkout master though
2012-01-21 02101, 2012
navap
But interestingly both master and the other branch work fine on rika
2012-01-21 02144, 2012
warp
it may be related to where it is looking for extensions.
2012-01-21 02111, 2012
warp
I know we changed where the cube extension gets installed (in the public schema instead of the musicbrainz schema)
2012-01-21 02138, 2012
warp
which also means we changed the postgresql search path (which is used to find extensions, among other things)
2012-01-21 02101, 2012
warp
so perhaps musicbrainz_collate is in public on rika, and older branches don't have public in the search path
2012-01-21 02120, 2012
warp
and the other way around on your server.
2012-01-21 02145, 2012
warp
ocharles made those changes, so he should be able to tell you the details.
2012-01-21 02134, 2012
navap
uh, what the hell! master works on rika, fails on xpc. bootstrap fails on rika, works on xpc.
2012-01-21 02142, 2012
warp
navap: exactly what I was describing :)
2012-01-21 02119, 2012
navap
But, but, it was partially working 5 min ago!
2012-01-21 02144, 2012
warp
haha
2012-01-21 02112, 2012
navap gets frustrated when he gets errors he didn't cause and can't fix :(
2012-01-21 02153, 2012
warp
the easy fix (if you're patient) is to do delete the database and do a fresh import of fullexport while you're on the master branch.
2012-01-21 02133, 2012
navap
That would be on xpc, the older server right?
2012-01-21 02136, 2012
warp
yes
2012-01-21 02149, 2012
navap
That's easy enough, I've only got the test db on there
2012-01-21 02154, 2012
warp
on rika you should be able to run the bootstrap branch by just merging master into it (git merge --log --no-ff master)
2012-01-21 02139, 2012
navap
heh, turns out you can't drop a db that has active sessions to it. That's a good thing :)
psql: FATAL: database "musicbrainz_db" does not exist
2012-01-21 02118, 2012
navap
Ah, the extra --
2012-01-21 02139, 2012
navap
I copied the line from the INSTALL which says carton exec ./admin/InitDb.pl -- --createdb --clean
2012-01-21 02151, 2012
navap
I imagine carton needs the extra --?
2012-01-21 02110, 2012
kepstin
yeah, that separates carton options from options that it passes through to the program it runs
2012-01-21 02152, 2012
warp runs off
2012-01-21 02154, 2012
warp
goodnight!
2012-01-21 02105, 2012
ianmcorvidae
warp: merge in master, as I recall -- nikki was having that trouble
2012-01-21 02106, 2012
navap
warp: Thanks! Both rika and xpc are fixed for me
2012-01-21 02112, 2012
ianmcorvidae
re: collate
2012-01-21 02154, 2012
ianmcorvidae
ah, it says that in the log
2012-01-21 02156, 2012
ianmcorvidae
cool :)
2012-01-21 02157, 2012
dukeleto joined the channel
2012-01-21 02101, 2012
Leftmost joined the channel
2012-01-21 02158, 2012
ruaok joined the channel
2012-01-21 02113, 2012
reosarevok joined the channel
2012-01-21 02146, 2012
ijabz joined the channel
2012-01-21 02129, 2012
ijabz joined the channel
2012-01-21 02106, 2012
ijabz joined the channel
2012-01-21 02109, 2012
the_metalgamer joined the channel
2012-01-21 02125, 2012
ijabz joined the channel
2012-01-21 02129, 2012
ruaok joined the channel
2012-01-21 02114, 2012
Leftmost joined the channel
2012-01-21 02128, 2012
ruaok joined the channel
2012-01-21 02110, 2012
ijabz joined the channel
2012-01-21 02120, 2012
Leftmost joined the channel
2012-01-21 02138, 2012
ijabz joined the channel
2012-01-21 02130, 2012
ijabz joined the channel
2012-01-21 02137, 2012
ocharles
navap, kepstin: is there any reason you're doing pull requests, and not going through the official process of submitting patches?
2012-01-21 02110, 2012
navap
I figured the best way to test out github's review system was to actually do a pull request. I have no problem submiting the patch to review board though.
2012-01-21 02117, 2012
ocharles
i would still prefer that, yea. I was hoping to use the cover art stuff to test reviews
2012-01-21 02121, 2012
ocharles
but I guess that doesn't have as many collaborators
2012-01-21 02142, 2012
ocharles
we should probably test github reviews if after the discussion it even looks like people want that
2012-01-21 02127, 2012
reosarevok joined the channel
2012-01-21 02128, 2012
reosarevok_ joined the channel
2012-01-21 02122, 2012
navap
ocharles: How do you suggest we fix the robots.txt rewriting? Is that something I could do?
2012-01-21 02147, 2012
reosarevok joined the channel
2012-01-21 02156, 2012
ocharles
navap: I was looking at that, but haven't quite got a solution yet
2012-01-21 02137, 2012
reosarevok_ joined the channel
2012-01-21 02108, 2012
ocharles
I'm thinking of having root/robots.txt disallow everything, and then having a set of features conf files, and one will rewrite /robots.txt into /robots-production.txt or something
