Submitter | Matt Harbison |
---|---|
Date | Sept. 22, 2018, 4:12 p.m. |
Message ID | <16e1621343329748b3d7.1537632771@Envy> |
Download | mbox | patch |
Permalink | /patch/34923/ |
State | Accepted |
Headers | show |
Comments
On Sat, 22 Sep 2018 12:12:51 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison <matt_harbison@yahoo.com> > # Date 1537632708 14400 > # Sat Sep 22 12:11:48 2018 -0400 > # Node ID 16e1621343329748b3d71735498f75e5f1378eb3 > # Parent 64d2e28870a8ec3bc5e24c181964b4d2cd188dc7 > tests: stabilize test-shelve.t#phasebased for #no-symlink and #no-execbit Queued, thanks.
Patch
diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -532,6 +532,15 @@ ensure that metadata-only changes are sh M a/a $ hg revert a/a +#else + +Dummy shelve op, to keep rev numbers aligned + + $ echo foo > a/a + $ hg shelve -q -n dummy a/a + $ hg unshelve -q dummy + $ hg revert a/a + #endif #if symlink @@ -545,6 +554,15 @@ ensure that metadata-only changes are sh M a/a $ hg revert a/a +#else + +Dummy shelve op, to keep rev numbers aligned + + $ echo bar > a/a + $ hg shelve -q -n dummy a/a + $ hg unshelve -q dummy + $ hg revert a/a + #endif set up another conflict between a commit and a shelved change