Re: Does anybody have release plans for current roundup devel?
Thomas Arendsen Hein <[email protected]>
| Newsgroups | gmane.comp.bug-tracking.roundup.devel |
|---|---|
| Message-ID | <[email protected]> |
* 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, 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). 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 "hg export 1234abcd | hg import -" to export a patch, apply it and commit it using the original author and commit message. 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". Regards, Thomas -- Thomas Arendsen Hein <[email protected]> - OpenPGP key: 0x5BB3F5195816791A https://blogs.intevation.de/thomas/ - https://intevation.de/~thomas/ Intevation GmbH, Neuer Graben 17, 49074 Osnabrueck - AG Osnabrueck, HR B 18998 Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner