[utah-devel] Increasing revision numbers during merges

Javier Collado javier.collado at canonical.com
Thu Aug 9 16:15:54 UTC 2012


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

Hello,

With regard to the discussion about how to keep revision numbers
increasing for merges, I haven't been able to write that small
documentation about it yet, but I've made some investigation and found
this:
http://stackoverflow.com/a/5417686/183066

which basically says how to setup a branch
(append_revisions_only=True) to reject pushes that lower the revision
number because of a merge using the wrong target branch.

I've already applied this configuration (using the sftp method) for
lp:utah/dev, so in the future we shouldn't have the same problem again
unless `--overwrite` option is used.

Max, I couldn't apply the same configuration for lp:utah, but you can
do it to avoid the same problem in that branch as well.

Best regards,
    Javier
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlAj4joACgkQDdoKZn+r4dKg3wCdH36YZohgO8cb14Weqrb6n+cY
OBMAoK/8AwCWAGKhUCRo3J1H8/vSFLJI
=vVsQ
-----END PGP SIGNATURE-----



More information about the Ubuntu-utah-devel mailing list