Re: [utah-devel] Increasing revision numbers during merges
Hello, On Fri 10 Aug 2012 10:28:59 PM CEST, Max Brustkern wrote: > Yeah, that is pretty rad. I don't seem to be able to access the trunk > either. What problem do you get? I'm able to do everything except uploading the new file to launchpad: $ sftp javier.coll...@bazaar.launchpad.net Connected to bazaar.launchpad.net. sftp> cd ~nuclearbob/utah/trunk/.bzr/branch sftp> get branch.conf Fetching /~nuclearbob/utah/trunk/.bzr/branch/branch.conf to branch.conf /~nuclearbob/utah/trunk/.bzr/branch/branch.co 100% 53 0.1KB/s 00:00 sftp> put branch.conf Uploading branch.conf to /~nuclearbob/utah/trunk/.bzr/branch/branch.conf branch.conf 100% 82 0.1KB/s 00:00 Couldn't write to remote file "/~nuclearbob/utah/trunk/.bzr/branch/branch.conf": Permission denied sftp> > We can ask the launchpad team about it, or we can just be > careful when we're merging into trunk, since we do it pretty rarely. You can also try to delete the branch from launchpad an push again your local branch with the udpated branch.conf file. Best regards, Javier signature.asc Description: OpenPGP digital signature -- Ubuntu-utah-devel mailing list Ubuntu-utah-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-utah-devel
Re: [utah-devel] Increasing revision numbers during merges
On 08/09/2012 12:20 PM, Joe Talbott wrote: On Thu, Aug 09, 2012 at 06:15:54PM +0200, Javier Collado wrote: ... Awesome! Thanks for sorting this out Javier. Joe Yeah, that is pretty rad. I don't seem to be able to access the trunk either. We can ask the launchpad team about it, or we can just be careful when we're merging into trunk, since we do it pretty rarely. Max -- Ubuntu-utah-devel mailing list Ubuntu-utah-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-utah-devel
Re: [utah-devel] Increasing revision numbers during merges
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 -- Ubuntu-utah-devel mailing list Ubuntu-utah-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-utah-devel
