Patchwork [10,of,10] shelve: no longer strip internal commit when using internal phase

login
register
mail settings
Submitter Augie Fackler
Date Sept. 10, 2018, 9:01 p.m.
Message ID <7219E8C6-234C-4FF4-AD9A-CBEB2393CD13@durin42.com>
Download mbox | patch
Permalink /patch/34470/
State New
Headers show

Comments

Augie Fackler - Sept. 10, 2018, 9:01 p.m.
> On Aug 29, 2018, at 12:30, Boris Feld <boris.feld@octobus.net> wrote:
> 
> # HG changeset patch
> # User Boris Feld <boris.feld@octobus.net>
> # Date 1528245106 -7200
> #      Wed Jun 06 02:31:46 2018 +0200
> # Node ID 18e2c4986d32aed2f10948277ba5dc1133f19f00
> # Parent  ccb9572516145a1b6f11a8d199c4a7da4774898b
> # EXP-Topic internal-phase.shelve
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 18e2c4986d32
> shelve: no longer strip internal commit when using internal phase

this one fails tests:


ERROR: test-shelve.t#phasebased output changed


I'm not sure why, could you fix and resend?

Patch

--- test-shelve.t
+++ test-shelve.t#phasebased.err
@@ -1858,11 +1858,9 @@ 
   unshelving change 'default'
   temporarily committing pending changes (restore with 'hg unshelve --abort')
   rebasing shelved changes
-  merging a
-  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
-  unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
+  note: unshelved changes already existed in the working copy
+  $ cat .hg/shelved/default.shelve
+  cat: .hg/shelved/default.shelve: $ENOENT$
   [1]
-  $ cat .hg/shelved/default.shelve
-  node=82e0cb9893247d12667017593ce1e5655860f1ac
-
-  $ cd ..
+
+  $ cd ..