merge with future 5.5 Test also run on 3.8 with minor cosmetic change. The 'separate' function is not available before 3.9 so we had to drop it.

integrate code update and test change from future 5.5 code This prove that the code is compatible with 3.9

merge with default, Mercurial 4.0-rc is out The content of the Mercurial stable branch changed, we update it here too.

open the mercurial-3.9 compat branch

merge with stable

evolve: lock the working copy early in next and prev (issue5244) Both next and prev depend on a consistent working copy, but were waiting to take the lock until they were ready to alter the working copy. Take the lock before reading the working copy state, and do not release it until we're definitely not going to change the working copy.

evolve: indent cmdnext and cmdprev ready for locking change (issue5244) The locking change I'm about to introduce forces an indentation shift. Do the indentation change with no code change now, to make the next change easier to review

tests: adapt to some change to topic output

split: avoid trying to split an empty commit (issue5191)

split: avoid trying to split an empty commit (issue5191)

evolve: fix test breaks related to double->single quote changes

merge with stable

bump: copy parent manifest before editting it Previously, the bump code would access the previous manifest, then edit that dictionary data structure. Because the manifest was in the mancache at that time, those edits were persisted to other readers who asked for that manifest. This caused commits being made during bump to have the wrong file parents in many situations (hence why the tests need updating).

backed out changeset 7a76f9a43e89

readme: add an entry about the {obsolete} template change (It should have been included into the parent changeset.

templates: change {obsolete} to emit only "obsolete" or "" The {obsolete} template function can currently emit "stable", "unstable", "extinct", or "suspended". The distinction between "extinct" and "suspended" seems likely to be more confusing that enlightening, and "stable" and "unstable" are not even obsolete. Let's simplify it to just emit "obsolete" for obsolete changesets and "" for others. That will also make it much easier to test for obsolete changsets and do things like "if(obsolete, obsolete, troubles)".

debug data for manifest change in core

evolve: drop point release of versions Modern Mercurial only looks at X.Y versions, so point releases can be dropped.

evolve: removed redundant try/finally blocks There were two todo's to remove the redundant try finally blocks. Done that and also fixed the indentation afterwards.

docs: spelling fixes Squashed into 1 commit because I'm lazy: - non-existant -> nonexistent - accros -> across - comptatibility -> compatibility - requieres -> requires - aliast -> alias - unexistent -> nonexistent - convertion -> conversion - nto -> not

simple4server: update buglink to point to bz.mercurial-scm.org

evolve: update buglink to point to bz.mercurial-scm.org

docs: use https for mercurial-scm.org

docs: point wiki and bz links to mercurial-scm.org

test: adapt to topic changes We display more information about the stacks, so we have to take than in account in the tests.

continue: ensure we hold the wlock before writing file to disk A hack in 'hg evolve --continue' involve writing a 'graftstate' file. We take the wlock before doing so.

test: also use 'devel.legacy.exchange=bundle1' in test Changeset 39537bc64442 in mercurial removed the 'experimental.bundle2' option. We use the new option in parallel.

dirstate: use arg count for version check In 52ff07e1de91 in the main hg repo, dirstate was changed to require a second argument, making the default args check no longer work. Instead, we switch to check the number of arguments, which should be backwards and forwards compatible.

merge back with stable

Added tag 5.4.1 for changeset 2ad40d972a74

prepare release 5.4.1

3.9 have been released