This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6729

tests: use `tr -d` and not `tr --delete` since the latter is absent on BSD tr(1)
ClosedPublic

Authored by durin42 on Aug 15 2019, 11:22 AM.

Details

Reviewers
av6
pulkit
Group Reviewers
hg-reviewers
Commits
rHG302dbc9d52be: tests: use `tr -d` and not `tr --delete` as the latter is absent on BSD tr(1)
rHG55f59a25c593: tests: use `tr -d` and not `tr --delete` since the latter is absent on BSD tr(1)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-merge-combination.t (2 lines)

Diff 16221

tests/test-merge-combination.t

> fi > fi
> elif [ $m = $r2 ] > elif [ $m = $r2 ]
> then if [ $base = $r1 ] > then if [ $base = $r1 ]
> then expected= > then expected=
> else expected=a > else expected=a
> fi > fi
> else expected=a > else expected=a
> fi > fi
> got=`hg log -r 3 --template '{files}\n' | tr --delete 'e '` > got=`hg log -r 3 --template '{files}\n' | tr -d 'e '`
> if [ "$got" = "$expected" ] > if [ "$got" = "$expected" ]
> then echo "$line$conflicts: agree on \"$got\"" > then echo "$line$conflicts: agree on \"$got\""
> else echo "$line$conflicts: hg said \"$got\", expected \"$expected\"" > else echo "$line$conflicts: hg said \"$got\", expected \"$expected\""
> fi > fi
> cd ../ > cd ../
> rm -rf repo > rm -rf repo
> done > done
> done > done