diff --git a/pep-0374.txt b/pep-0374.txt index 9232d0fd3..c947ce853 100644 --- a/pep-0374.txt +++ b/pep-0374.txt @@ -1063,8 +1063,11 @@ to put temporarily aside. hg unshelve # Complete initial fix. hg commit - cd .. - rm -rf issue0000 + cd ../trunk + hg pull ../issue0000 + hg merge + hg commit + rm -rf ../issue0000 Several other way to approach this scenario with Mercurial. Alexander Solovyov presented a few `alternative approaches`_ on Mercurial's mailing list.