I stumbled on the same thing. It's unfortunate that Bitbucket's support for bookmarks in PRs is lacking. :(
Does any one know if the PR updates automatically when further commits are made, as Florian, asked? I have no problem myself in using bookmarks, but the "Contributing" section should mention this along with a "how-to" to workaround Bitbucket's limitations on that regard. On Sun, Aug 10, 2014 at 7:49 PM, Marc Abramowitz <msabr...@gmail.com> wrote: > Cool. I tried to use hg bookmarks once or twice, wanting to use them > because of their "light" nature that you mentioned and because they seemed > like a closer match to the branches that I'm accustomed to in git. > > I stumbled on the Bitbucket part and couldn't figure out how to make it > work. But now with your description (thanks!), I can probably make it work. > So I'm definitely up for trying it. > > -Marc > http://marc-abramowitz.com > Sent from my iPhone 4S > > > > On Aug 10, 2014, at 3:12 PM, Floris Bruynooghe <f...@devork.be> wrote: > > > > Hi, > > > > I was wondering if people would be fine with encouraging contributors > > to use bookmarks rather then named branches in mercurial for pull > > requests. Named branches are rather permanent and more suited for > > things like the 2.6.x release branch or permanent things like that. > > > > Bookmarks work really nice, the only downside is that bitbucket does > > not support them as well. They are shown on the commits view just > > fine, however when doing a pull request you will have to use the hex > > revision number in the bitbucket UI rather then having to use the > > bookmark name as it will just show the branch name "default" together > > with the hex number (multiple times if you have multiple heads). > > > > An additional benefit is that they wouldn't need the "closing branch" > > commit we get so often right now. Bookmarks do not make it to the > > repo on accepting a pull request. Even if a bookmark gets pushed to > > the hpk42/pytest repo they can be easily deleted without a commit (hg > > bookmark -d $name; hg push -B $name). > > > > The CONTRIBUTING.rst file would not even change that much for simple > > use, I've included the diff below to demonstrate. > > > > What do people think of this? Or am I the only one who doesn't like > > the accumulation of closed branches? > > > > Regards, > > Floris > > > > > > > > diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst > > --- a/CONTRIBUTING.rst > > +++ b/CONTRIBUTING.rst > > @@ -97,11 +97,11 @@ 2. Create and activate a fork-specific v > > .. _checkout: > > > > 3. Clone your fork locally using `Mercurial < > http://mercurial.selenic.com/>`_ > > - (``hg``) and create a branch:: > > + (``hg``) and create a bookmark:: > > > > $ hg clone ssh://h...@bitbucket.org/YOUR_BITBUCKET_USERNAME/pytest > > $ cd pytest > > - $ hg branch your-branch-name > > + $ hg bookmark your-bookmark-name > > > > If you need some help with Mercurial, follow this quick start > > guide: http://mercurial.selenic.com/wiki/QuickStart > > @@ -136,7 +136,7 @@ 4. You can now edit your local working c > > 5. Commit and push once your tests pass and you are happy with your > change(s):: > > > > $ hg commit -m"<commit message>" > > - $ hg push -b . > > + $ hg push -B your-bookmark-name > > > > 6. Finally, submit a pull request through the BitBucket website: > > > > @@ -144,10 +144,14 @@ 6. Finally, submit a pull request throug > > :width: 700px > > :align: center > > > > - :: > > + Unfortunately bitbucket does currently not support pull requests > > + from bookmarks very well, this means you have to do the pull request > > + by the hex commit number rather then by name. To find the hex > > + commit revision run ``hg bookmarks`` locally and then use it in the > > + pull request dialog:: > > > > source: YOUR_BITBUCKET_USERNAME/pytest > > - branch: your-branch-name > > + branch: hex-commit-rev > > > > target: hpk42/pytest > > branch: default > > > > > > -- > > Debian GNU/Linux -- The Power of Freedom > > www.debian.org | www.gnu.org | www.kernel.org > > _______________________________________________ > > Pytest-dev mailing list > > Pytest-dev@python.org > > https://mail.python.org/mailman/listinfo/pytest-dev > _______________________________________________ > Pytest-dev mailing list > Pytest-dev@python.org > https://mail.python.org/mailman/listinfo/pytest-dev >
_______________________________________________ Pytest-dev mailing list Pytest-dev@python.org https://mail.python.org/mailman/listinfo/pytest-dev
