Mercurial > hg-git

comparison tests/test-branch-bookmark-suffix.t @ 1084:93d3f8cf9657

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a3b12aa1bcd6
children
comparison
equal deleted inserted replaced
1083:6a0626959edb 1084:93d3f8cf9657
82 Cloning into 'gitrepo2'... 82 Cloning into 'gitrepo2'...
83 done. 83 done.
84 $ cd gitrepo2 84 $ cd gitrepo2
85 $ git checkout branch1 2>&1 | grep -v 'up-to-date' 85 $ git checkout branch1 2>&1 | grep -v 'up-to-date'
86 Already on 'branch1' 86 Already on 'branch1'
87 Your branch is up to date with 'origin/branch1'. (?)
87 $ echo g1 >> f1 88 $ echo g1 >> f1
88 $ git add f1 89 $ git add f1
89 $ commit -m "append f1" 90 $ commit -m "append f1"
90 $ git checkout branch2 91 $ git checkout branch2
91 Switched to a new branch 'branch2' 92 Switched to a new branch 'branch2'
92 Branch branch2 set up to track remote branch branch2 from origin. 93 Branch '?branch2'? set up to track remote branch '?branch2'? from '?origin'?. (re)
93 $ echo g2 >> f2 94 $ echo g2 >> f2
94 $ git add f2 95 $ git add f2
95 $ commit -m "append f2" 96 $ commit -m "append f2"
96 $ git push origin 97 $ git push origin
97 To $TESTTMP/gitrepo1 98 To $TESTTMP/gitrepo1