Mercurial > hg-git
changeset 1084:93d3f8cf9657
tests: update to new git output
The tests were failing on some minor output changes. It looks like this is
output change on the git side. We match the two variants in the tests.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 24 Nov 2017 21:04:54 +0100 |
| parents | 6a0626959edb |
| children | 1003994dd497 |
| files | tests/test-branch-bookmark-suffix.t |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-branch-bookmark-suffix.t Mon Nov 20 17:12:20 2017 +0100 +++ b/tests/test-branch-bookmark-suffix.t Fri Nov 24 21:04:54 2017 +0100 @@ -84,12 +84,13 @@ $ cd gitrepo2 $ git checkout branch1 2>&1 | grep -v 'up-to-date' Already on 'branch1' + Your branch is up to date with 'origin/branch1'. (?) $ echo g1 >> f1 $ git add f1 $ commit -m "append f1" $ git checkout branch2 Switched to a new branch 'branch2' - Branch branch2 set up to track remote branch branch2 from origin. + Branch '?branch2'? set up to track remote branch '?branch2'? from '?origin'?. (re) $ echo g2 >> f2 $ git add f2 $ commit -m "append f2"