Mercurial > hg
comparison tests/test-shelve.t @ 24233:b6bcfd160e14
test-shelve: be more lenient about whitespace (issue4124)
When running on a slower systems (eg. MIPS buildd), the age of the
shelf can be 10 seconds or more, resulting in the output alignment
changing and thus a test failure. This patch makes the spacing be
matched more leniently.
| author | Tristan Seligmann <mithrandi@debian.org> |
|---|---|
| date | Mon, 09 Mar 2015 12:32:29 -0400 |
| parents | aa4a1672583e |
| children | 325f03de849d |
comparison
equal
deleted
inserted
replaced
| 24232:f9e8739018d5 | 24233:b6bcfd160e14 |
|---|---|
| 79 $ hg status -C | 79 $ hg status -C |
| 80 | 80 |
| 81 ensure that our shelved changes exist | 81 ensure that our shelved changes exist |
| 82 | 82 |
| 83 $ hg shelve -l | 83 $ hg shelve -l |
| 84 default-01 (*) changes to '[mq]: second.patch' (glob) | 84 default-01 (*)* changes to '[mq]: second.patch' (glob) |
| 85 default (*) changes to '[mq]: second.patch' (glob) | 85 default (*)* changes to '[mq]: second.patch' (glob) |
| 86 | 86 |
| 87 $ hg shelve -l -p default | 87 $ hg shelve -l -p default |
| 88 default (*) changes to '[mq]: second.patch' (glob) | 88 default (*)* changes to '[mq]: second.patch' (glob) |
| 89 | 89 |
| 90 diff --git a/a/a b/a/a | 90 diff --git a/a/a b/a/a |
| 91 --- a/a/a | 91 --- a/a/a |
| 92 +++ b/a/a | 92 +++ b/a/a |
| 93 @@ -1,1 +1,2 @@ | 93 @@ -1,1 +1,2 @@ |