calibre-devs team mailing list archive

[Timothy Legge <timlegge@xxxxxxxxx>]

Hi

Basically, I did:

1) bzr merge (from the custom-cols)
2) Forgot to commit and started changes
3) bzr commit -m "Kobo - Display list of books from database by card,
display thumbnails.  Seems to have small issue with the caching."
4) bzr merge
5) bzr commit -m "Pull from trunck"

So my changes and a pull from the trunk in 1) are combined.

Tim

On Sat, May 22, 2010 at 12:06 AM, Kovid Goyal <kovid@xxxxxxxxxxxxxx> wrote:

> Can't say unless you describe the problem in more detail.
>
> But generally speaking:
>
> bzr diff -h
>
> bzr revert -h
>
> Should give you the information you need.
>
> Kovid.
>
> On Sat, May 22, 2010 at 12:03:46AM -0300, Timothy Legge wrote:
> > I also seem to have screwed up the merging and a pull from custom-cols
> and
> > some driver update work got merged together.  Is there a way to fix that?
> >
> > Tim
> >
> >
> > !DSPAM:3,4bf749b222491903456208!
>
> > _______________________________________________
> > Mailing list: https://launchpad.net/~calibre-devs<https://launchpad.net/%7Ecalibre-devs>
> > Post to     : calibre-devs@xxxxxxxxxxxxxxxxxxx
> > Unsubscribe : https://launchpad.net/~calibre-devs<https://launchpad.net/%7Ecalibre-devs>
> > More help   : https://help.launchpad.net/ListHelp
> >
> >
> > !DSPAM:3,4bf749b222491903456208!
>
>
> --
> _____________________________________
>
> Dr. Kovid Goyal
> http://www.kovidgoyal.net
> http://calibre-ebook.com
> _____________________________________
>
> _______________________________________________
> Mailing list: https://launchpad.net/~calibre-devs<https://launchpad.net/%7Ecalibre-devs>
> Post to     : calibre-devs@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~calibre-devs<https://launchpad.net/%7Ecalibre-devs>
> More help   : https://help.launchpad.net/ListHelp
>
>