https://bz.mercurial-scm.org/show_bug.cgi?id=6186
Bug ID: 6186
Summary: test-merge-combination.t test failure: unportable
tr(1) usage
Product: Mercurial
Version: 5.1
Hardware: All
OS: NetBSD
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: t...@giga.or.at
CC: mercurial-devel@mercurial-scm.org
The test-merge-combination test fails on NetBSD because its tr(1) does not
support '--' (I think):
---
/scratch/devel/py-mercurial/work/mercurial-5.1/tests/test-merge-combination.t
+++
/scratch/devel/py-mercurial/work/mercurial-5.1/tests/test-merge-combination.t.err
@@ -89,57 +89,317 @@
> }
$ genmerges
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
1111 : agree on ""
- 1112 : agree on "a"
- 111- : agree on "a"
- 1121 : agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1112 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 111- : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1121 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
1122 : agree on ""
- 1123 : agree on "a"
- 112- : agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1123 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 112- : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
11-1 : hg said "", expected "a"
- 11-2 : agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 11-2 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
11-- : agree on ""
- 1211 : agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1211 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
1212 : agree on ""
- 1213 : agree on "a"
- 121- : agree on "a"
- 1221 : agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1213 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 121- : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1221 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
1222 : agree on ""
- 1223 : agree on "a"
- 122- : agree on "a"
- 1231 C: agree on "a"
- 1232 C: agree on "a"
- 1233 C: agree on "a"
- 1234 C: agree on "a"
- 123- C: agree on "a"
- 12-1 C: agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1223 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 122- : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1231 C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1232 C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1233 C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1234 C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 123- C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 12-1 C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
12-2 C: hg said "", expected "a"
- 12-3 C: agree on "a"
- 12-- C: agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 12-3 C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 12-- C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
1-11 : hg said "", expected "a"
- 1-12 : agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1-12 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
1-1- : agree on ""
- 1-21 C: agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1-21 C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
1-22 C: hg said "", expected "a"
- 1-23 C: agree on "a"
- 1-2- C: agree on "a"
- 1--1 : agree on "a"
- 1--2 : agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1-23 C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1-2- C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1--1 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ 1--2 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
1--- : agree on ""
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
-111 : agree on ""
- -112 : agree on "a"
- -11- : agree on "a"
- -121 C: agree on "a"
- -122 C: agree on "a"
- -123 C: agree on "a"
- -12- C: agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ -112 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ -11- : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ -121 C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ -122 C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ -123 C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ -12- C: hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
-1-1 : agree on ""
- -1-2 : agree on "a"
- -1-- : agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ -1-2 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ -1-- : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
--11 : agree on ""
- --12 : agree on "a"
- --1- : agree on "a"
- ---1 : agree on "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ --12 : hg said "", expected "a"
+ tr: unknown option -- -
+ usage: tr [-cs] string1 string2
+ tr [-c] -d string1
+ tr [-c] -s string1
+ tr [-c] -ds string1 string2
+ --1- : hg said "", expected "a"
...
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
