Patchwork [3,of,3] test-shelve: shorten a long path so it works on Windows

login
register
mail settings
Submitter Matt Harbison
Date April 16, 2016, 3:52 a.m.
Message ID <8052417c9a90b481bc71.1460778734@Envy>
Download mbox | patch
Permalink /patch/14676/
State Accepted
Delegated to: Yuya Nishihara
Headers show

Comments

Matt Harbison - April 16, 2016, 3:52 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1460775233 14400
#      Fri Apr 15 22:53:53 2016 -0400
# Node ID 8052417c9a90b481bc71254cbf04307481a3f656
# Parent  ab0ec5c112d7a5ed96fd7d2a3a767147f1ccf671
test-shelve: shorten a long path so it works on Windows

Patch

diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -1497,8 +1497,10 @@ 
 running 'shelve --continue' the branch information won't be
 restored and branch will be unchanged.
 
-  $ hg init shelve_on_new_branch_conflict_with_previous_shelvedstate
-  $ cd shelve_on_new_branch_conflict_with_previous_shelvedstate
+shelve on new branch, conflict with previous shelvedstate
+
+  $ hg init conflict
+  $ cd conflict
   $ echo "aaa" >> a
   $ hg commit -A -m "a"
   adding a