Mercurial > public > mercurial-scm > hg
diff tests/test-histedit-non-commute.t @ 17086:5f2cacb715dc
tests: make histedit tests more resilient to filesystem variation
Better quoting of odd filesystem paths and no dependency to execute bit.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sat, 30 Jun 2012 03:34:50 +0200 |
| parents | 35729bdd59b6 |
| children | a79776f427b4 |
line wrap: on
line diff
--- a/tests/test-histedit-non-commute.t Sat Jun 30 03:34:44 2012 +0200 +++ b/tests/test-histedit-non-commute.t Sat Jun 30 03:34:50 2012 +0200 @@ -71,7 +71,7 @@ edit the history - $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle + $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 1 out of 1 hunks FAILED -- saving rejects to file e.rej abort: Fix up the change and run hg histedit --continue @@ -122,7 +122,7 @@ edit the history - $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle + $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 1 out of 1 hunks FAILED -- saving rejects to file e.rej abort: Fix up the change and run hg histedit --continue @@ -190,14 +190,14 @@ > EOF edit the history, this time with a fold action - $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle + $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 1 out of 1 hunks FAILED -- saving rejects to file e.rej abort: Fix up the change and run hg histedit --continue $ echo a > e $ hg add e - $ HGEDITOR="cat $EDITED > " hg histedit --continue 2>&1 | fixbundle + $ HGEDITOR="cat \"$EDITED\" > " hg histedit --continue 2>&1 | fixbundle 0 files updated, 0 files merged, 0 files removed, 0 files unresolved file e already exists 1 out of 1 hunks FAILED -- saving rejects to file e.rej