Code review comment for lp://staging/~yarkot/web2conf/badge_support

It refuses to merge. says you branch "has no common ancestor and no
merge base revision was specified" what should I do?

Massimo

On Jan 19, 2009, at 1:08 PM, yarko wrote:

> yarko has proposed merging lp:~yarkot1/web2conf/badge_support into
> lp:web2conf.
>
> Requested reviews:
> Massimo (mdipierro)
>
> This is what is up on us3.pycon.org;
>
> There are a few more details that I like to see change which have
> not yet (i.e. - t2.search now seems to show headings - which messes
> up search for badges; I'll see if it's configurable, else change to
> take t2 from within web2conf/modules, and change t2 in there).
>
> Also - details like email, text, etc. are not yet updated.
>
> In modules/0.py, there is now a variable - DEV_TEST - which disables
> email verification and recaptcha checks (for development tests);
> set it to either True or False.
>
> Regards,
>
> Yarko
> --
> https://code.launchpad.net/~yarkot1/web2conf/badge_support/+merge/2963
> You are requested to review the proposed merge of lp:~yarkot1/
> web2conf/badge_support into lp:web2conf.