Just git merge his branch on your master or rebase Andreas's branch
(the new one) on top of master (should be pain-free)
> Hi Andreas,
>
>
> Thanks, but sorry, I seem to be missing some things here:
>
> What I want is (if possible) to have a shotwell instance based on
> 23.5
> and with map support.
>
> Also, or alternatively, I'd like to test your recent modifications on
> the map
> features.
>
> Thanks for further help with this.
>
> Regards,
> Ulf
>
>
> Andreas Brauchli <[email protected]> writes:
>
> | [1:text/plain Hide]
> >
> >
> | Hey Ulf,
> >
> >
> | On Mon, 2016-07-25 at 21:03 +0200, Ulf Rehmann wrote:
> >
> > >
> > >
> > > Thanks, Jens and Andreas!
> > >
> > > | I usually change the format to 20 in the sqlite db with
> > > sqliteman.
> > >
> > > Yes, I did this!
> > >
> > > However, how will I now get the map support into 23.5 ?
> | Upgrading will be a no-op (except that it'll update the version
> back to
> | 21). If the columns already exist nothing happens to them and all
> | positions will remain intact exactly the way they were before the
> | "downgrade" to v20.
> >
> >
> | Cheers
> >
> >
> > >
> > > Andreas Brauchli <[email protected]> writes:
> > >
> > > | [1:multipart/alternative Hide]
> > > >
> > > >
> > > >
> > > >
> > > | [1/1:text/plain Hide]
> > > >
> > > >
> > > >
> > > | Hey Ulf, Jens,
> > > >
> > > >
> > > >
> > > | I usually change the format to 20 in the sqlite db with
> > > sqliteman.
> > > >
> > > >
> > > >
> > > | Like Jens said, the change is backwards compatible to v20. A
> > > second update
> > > | to 21 (map support) should also be transparent and
> > > nondestructive.
> > > >
> > > >
> > > >
> > > | Cheers
> > > >
> > > >
> > > >
> > > | On Jul 25, 2016 15:34, "Jens Georg" <[email protected]> wrote:
> > > >
> > > >
> > > >
> > > > >
> > > > >
> > > > > If you are cross-grading to "normal" shotwell, you can
> > > > > manually
> > > > > set the
> > > > > schema version in the photo.db to 20. The map patch only adds
> > > > > columns (I
> > > > > agree this is a bit unfortunate)
> > > > >
> > > > > Hi Andreas,
> > > > > >
> > > > > >
> > > > > >
> > > > > > When trying to upgrade to 0.23.5 I run into a problem at
> > > > > > runtime
> > > > > > (compiling looks ok):
> > > > > >
> > > > > > It says:
> > > > > >
> > > > > > Your photo library is not compatible with this version
> > > > > > of
> > > > > > Shotwell.
> > > > > > It appears it was created by Shotwell 0.23.2 (schema
> > > > > > 21). This
> > > > > > version is 0.23.5 (schema 20). Please use the latest
> > > > > > version of
> > > > > > Shotwell.
> > > > > >
> > > > > > I guess this results from my former clone of your
> > > > > > https://github.com/abrauchli/shotwell.git ??
> > > > > >
> > > > > > What should I do? rebuild the whole photo libary?
> > > > > >
> > > > > > Regards,
> > > > > > Ulf
> > > > > > _______________________________________________
> > > > > > shotwell-list mailing list
> > > > > > [email protected]
> > > > > > https://mail.gnome.org/mailman/listinfo/shotwell-list
> > > > > >
> > > > > _______________________________________________
> > > > > shotwell-list mailing list
> > > > > [email protected]
> > > > > https://mail.gnome.org/mailman/listinfo/shotwell-list
> > > > >
> > > >
> > > | [1/2:text/html Show]
> > > >
> > > >
> > > >
> > > >
> > > | [2:text/plain Hide]
> > > >
> > > >
> > > >
> > > | _______________________________________________
> > > | shotwell-list mailing list
> > > | [email protected]
> > > | https://mail.gnome.org/mailman/listinfo/shotwell-list
> >
> | [2:application/pgp-signature Show Save:signature.asc (181B)]
> _______________________________________________
> shotwell-list mailing list
> [email protected]
> https://mail.gnome.org/mailman/listinfo/shotwell-list
_______________________________________________
shotwell-list mailing list
[email protected]
https://mail.gnome.org/mailman/listinfo/shotwell-list
