Mercurial > hg-allpaths
changeset 58:35d3c8ef6fe9
Fixed test failing on 4.0
| author | Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl> |
|---|---|
| date | Sun, 13 Nov 2016 12:41:11 +0100 |
| parents | 95b5ba2cd363 |
| children | 206d72bdc4e9 |
| files | HISTORY.txt tests/groups-modern.t |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/HISTORY.txt Sun Nov 13 12:32:39 2016 +0100 +++ b/HISTORY.txt Sun Nov 13 12:41:11 2016 +0100 @@ -1,3 +1,8 @@ +1.0.1 +~~~~~~~~~~~~~ + +Tests fixed to work on mecurial 4.0 … and 2.7. + 1.0.0 ~~~~~~~~~~~~~
--- a/tests/groups-modern.t Sun Nov 13 12:32:39 2016 +0100 +++ b/tests/groups-modern.t Sun Nov 13 12:41:11 2016 +0100 @@ -253,7 +253,7 @@ pushing to */rep1 (glob) searching for changes abort: push creates new remote head *! (glob) - (merge or see "hg help push" for details about pushing new heads) + \((merge or see .hg help push. for details about pushing new heads|did you forget to merge.*)\) (re) [255] $ hg --cwd $BASE pullall