[utah-devel] Increasing revision numbers during merges

Joe Talbott joe.talbott at canonical.com
Thu Aug 9 16:20:35 UTC 2012


On Thu, Aug 09, 2012 at 06:15:54PM +0200, Javier Collado wrote:
> -----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.

Awesome! Thanks for sorting this out Javier.

Joe



More information about the Ubuntu-utah-devel mailing list