Re: Does anybody have release plans for current roundup devel?

In message <[email protected]>,
Thomas Arendsen Hein writes:
>* John P. Rouillard <[email protected]> [20190220 02:45]:
>> that could go into a 1.6.1 release. Thomas Hein do you have a cheat
>> sheet for creating a 1.6 release branch and tagging a 1.6.1 release?
>
>There already is a "maint-1.6" branch,

Ah yes, I may even have set that up 8-/...

>so just use "hg co maint-1.6"
>(or checkout/update/up, all aliases for the same, but I'm coming
>from RCS, so "co" is my favourite alias :))
>
>After that work on this branch, and "hg co default && hg merge
>maint-1.6" to merge the 1.6 changes into the default branch).

I think all the changes I would want on the 1.6 maint branch are
already in the mainline/default branch.  I plan on cherry picking
changes from default to maint-1.6. What happens if I do that and "hg
co default && hg merge maint-1.6" is run? I asume nothing if I use
graft to cherry pick?

>To cherry-pick changes from the default branch into maint-1.6 there
>are multiple ways. The most basic is checking out the maint-1.6
>branch, exporting a patch and applying it:
>If the patch fully applies you could do

I assume I should do an "hg export 1234abcd | patch -s -p1" verify it
applies ok and works. then 'hg revert --all' to clean the directory
followed by:

>"hg export 1234abcd | hg import -" to export a patch, apply it and
>commit it using the original author and commit message.

which exports the patch and imports it on the branch in my working
directory and does the commit.

>Or "hg export 1234abcd | patch -s -p1" to just apply it, then commit
>it yourself later.

>A more advanced way would be using "hg graft", see
>https://www.mercurial-scm.org/repo/hg/help/graft
>This will not use simple patches, but Mercurial's merge logic.
>If you already did set up your preferred merge tool in Mercurial,
>I'd recommend using "hg graft".

So if I was going this way, I would update to maint-1.6 and use:

  hg graft 0cdf19b82354  # fix for issue2550994 (breakage caused by
                         # configparser backports

  edit CHANGES.txt       # to resolve any failed patches from the graft

  hg graft -c            # commits the graft 
  
  hg graft xxyyyzzz      # patch for environment vars once I commit
                         # it to default

  edit CHANGES.txt       # to resolve any failed patches from the graft

  hg graft -c            # commits the graft 
  
  test

Does that look right?

Thanks for your help. Have a great week.
--
				-- rouilj
John Rouillard
===========================================================================
My employers don't acknowledge my existence much less my opinions.