[ckan-dev] merge issues with feature-#838-uireview

Tue Dec 14 10:16:19 UTC 2010

On Tue, Dec 14, 2010 at 1:26 AM, Rufus Pollock <rufus.pollock at okfn.org> wrote:
> Hi Richard,
>
> I just noticed this evening while looking at tip that none of your
> changes that I thought we had merged into default from
> feature-#838-uireview had been merged.
>
> Looking back it is clear that in the crucial merge from default [1]
> you accidentally blew away all your changes ;)
>
> I have done my best to remerge [2] to make sure we do have your
> changes but there are now some failing tests due to the updates to the
> package pages etc. I don't have time now to fix and I know you
> resolved quite a few of these last week so I propose leaving it to you
> to go into branch-#838-uireview and resolve the failing tests :)

OK, will have another go,

Richard

>
> Once that is done you can remerge into default and push!
v>
> Rufus
>
> [1]: http://bitbucket.org/okfn/ckan/changeset/d5fdacf2fcd2
> [2]: http://bitbucket.org/okfn/ckan/changeset/55313237953d and following
>

-- 
/*
richard at memespring.co.uk
memespring.co.uk
++44 7976730458
memespring (flickr/skype/etc)
memspr (aim)
*/