hg-1.4.3 test, solaris: only 2 errors left
rupert.thurner
rupert.thurner at gmail.com
Tue Feb 9 16:01:22 CST 2010
hg-1.4.2 tested on solaris with 5 errors [1], and hg-1.4.3 tested now
with only two errors [2]
Failed test-rebase-parameters: output changed and returned error code
208
Failed test-rename-merge2: output changed and returned error code 208
# Ran 358 tests, 32 skipped, 2 failed.
[1] http://mercurial.pastebin.com/f7f400bda
[2] http://mercurial.pastebin.com/f748df82c
the rebase error is below:
ERROR: test-rebase-parameters output changed and returned error code
208
--- Expected output
+++ Test output
@@ -1,200 +1,2 @@
-% These fail
-% Use continue and abort
-hg rebase: cannot use both abort and continue
-hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--
keepbranches] | [-c] | [-a]
-
-move changeset (and descendants) to a different branch
-
- Rebase uses repeated merging to graft changesets from one part of
history
- onto another. This can be useful for linearizing local changes
relative to
- a master development tree.
-
- If a rebase is interrupted to manually resolve a merge, it can be
- continued with --continue/-c or aborted with --abort/-a.
-
-options:
-
- -s --source rebase from a given revision
- -b --base rebase from the base of a given revision
- -d --dest rebase onto a given revision
- --collapse collapse the rebased changesets
- --keep keep original changesets
- --keepbranches keep original branch names
- -c --continue continue an interrupted rebase
- -a --abort abort an interrupted rebase
- --style display using template map file
- --template display with template
rupert.
More information about the Mercurial-devel
mailing list