Brenda Wallace wrote: > On Thu, Jul 16, 2009 at 8:47 PM, Ciaran Gultnieks<[email protected]> wrote: >> Are you sure these weren't merged? I merged all the outstanding merge >> requests from your branch not long after that original message. > > No, i couldn't make a merge request - ended up raising with the > gitorious devs who fixed the bug a week later. > hence I emailed here with branch name.
Ok, that's confusing - the merge requests were definitely there. I reviewed the changes, I merged the stuff, I committed it, and I marked each merge request as merged on gitorious. I also tested it with PostgreSQL and it all worked. There were multiple copies of the requests, so maybe you thought the requests were not working, but really they were? (That was 9 days ago, according to http://micro.ciarang.com/notice/108184) Anyway, looking again, there is an added complication. The merges were done against the 'dev' repo which no longer exists, and it doesn't look like the changes were transferred across to 'mainline' before 'dev' was dropped, so I will have to do them again. I should just be able to push the changes from my local repo back to mainline though. Cheers, Ciaran _______________________________________________ Laconica-dev mailing list [email protected] http://mail.laconi.ca/mailman/listinfo/laconica-dev
