Merge lp://staging/~thisfred/u1db/remove-local-gen-before-sync into lp://staging/u1db

01:31:04 O: [ 33%] Building C object src/CMakeFiles/u1db.dir/u1db.c.o
01:31:04 E: /mnt/tarmac/cache/u1db/trunk/src/u1db.c: In function ‘u1db_sync’:
01:31:04 E: /mnt/tarmac/cache/u1db/trunk/src/u1db.c:2092:5: error: too many arguments to function ‘u1db__sync_db_to_target’
01:31:04 E: In file included from /mnt/tarmac/cache/u1db/trunk/src/u1db.c:28:0:
01:31:04 E: /mnt/tarmac/cache/u1db/trunk/include/u1db/u1db_internal.h:544:5: note: declared here
01:31:04 E: make[3]: *** [src/CMakeFiles/u1db.dir/u1db.c.o] Error 1
01:31:04 E: make[2]: *** [src/CMakeFiles/u1db.dir/all] Error 2
01:31:04 E: make[1]: *** [CMakeFiles/check-valgrind.dir/rule] Error 2
01:31:04 E: make: *** [check-valgrind] Error 2

fixed

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 8/15/2012 12:57 AM, Eric Casteleijn wrote:
> Eric Casteleijn has proposed merging
> lp:~thisfred/u1db/remove-local-gen-before-sync into lp:u1db.
>
> Requested reviews: Ubuntu One hackers (ubuntuone-hackers)
>
> For more details, see:
> https://code.launchpad.net/~thisfred/u1db/remove-local-gen-before-sync/+merge/119642
>
> removed unused parameter
>

This was meant to be an OUT parameter for sync (the return value from
the Python code).

The idea is that you want to be able to get the local generation of
the database after the sync, so that you can call
'whats_changed(before_sync_gen)' without having a race condition.

It may be that we are missing tests doing that sort of thing, so the
variable never got set, because we didn't realize that we should be.

But it *was* meant to be used.

Is there some other change that invalidates this?

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlArVA4ACgkQJdeBCYSNAAO1PwCfZ5fBV5pC1d6qIpkXevcdSItV
P/MAn0A5XKtcqWN7+r5+XEgCUG6vAtGO
=0eye
-----END PGP SIGNATURE-----

so it seems it had a thought use