← Back to team overview

duplicity-team team mailing list archive

Re: [Merge] lp:~ed.so/duplicity/verify.data into lp:duplicity

 

It's merged on my machine.  Will push it when I get back.
 On Feb 17, 2013 1:22 PM, "edso" <edgar.soldin@xxxxxx> wrote:

> you mean merged OR released? ..ede
>
> On 17.02.2013 20:16, Kenneth Loafman wrote:
> > The verify branch merged OK.  Will get it out.
> >  On Feb 17, 2013 1:02 PM, "edso" <edgar.soldin@xxxxxx> wrote:
> >
> >> do you plan another release already? if not.. i am still accumulating
> >> changes for the manpage, will rebase that shortly before the next
> release,
> >> if ok with you.
> >>
> >> the verify data branch should not conflict by itself.
> >>
> >> ..ede
> >>
> >> On 17.02.2013 19:01, Kenneth Loafman wrote:
> >>> edso,  the man page had merge conflicts.  Please fix and I'll get this
> >> one out.
> >>>
> >>> ...Ken
> >>>
> >>> On Sat, Feb 16, 2013 at 8:03 AM, edso <edgar.soldin@xxxxxx> wrote:
> >>>> The proposal to merge lp:~ed.so/duplicity/verify.data into
> >> lp:duplicity has been updated.
> >>>>
> >>>> Description changed to:
> >>>>
> >>>> add switch --compare-data, to selectively enable formerly always
> >> disabled data comparison on verify runs
> >>>>
> >>>> man page doc will be in lp:~ed.so/duplicity/man.page
> >>>>
> >>>> For more details, see:
> >>>> https://code.launchpad.net/~ed.so/duplicity/verify.data/+merge/148873
> >>>> --
> >>>> https://code.launchpad.net/~ed.so/duplicity/verify.data/+merge/148873
> >>>> You are subscribed to branch lp:duplicity.
> >>>
> >>
> >> --
> >> https://code.launchpad.net/~ed.so/duplicity/verify.data/+merge/148873
> >> You are subscribed to branch lp:duplicity.
> >>
> >
>
> --
> https://code.launchpad.net/~ed.so/duplicity/verify.data/+merge/148873
> You are subscribed to branch lp:duplicity.
>

-- 
https://code.launchpad.net/~ed.so/duplicity/verify.data/+merge/148873
Your team duplicity-team is requested to review the proposed merge of lp:~ed.so/duplicity/verify.data into lp:duplicity.


References