Merge lp://staging/~jelmer/brz/abspath-fix into lp://staging/brz
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | 7875 |
Merged at revision: | 7874 |
Proposed branch: | lp://staging/~jelmer/brz/abspath-fix |
Merge into: | lp://staging/brz |
Diff against target: |
40 lines (+6/-3) 2 files modified
breezy/tests/blackbox/test_serve.py (+3/-3) crates/osutils/src/path.rs (+3/-0) |
To merge this branch: | bzr merge lp://staging/~jelmer/brz/abspath-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email: mp+451063@code.staging.launchpad.net |
Commit message
Don't make a path that's already absolute, absolute
Description of the change
Don't make a path that's already absolute, absolute
To post a comment you must log in.
The attempt to merge lp:~jelmer/brz/abspath-fix into lp:brz failed. Command exited with 1.
Below is the output from the failed tests.
... OUTPUT TRIMMED ...
breezy. plugins. email.tests. testemail. TestGetTo. test_should_ not_send_ sender_ configured OK 63ms plugins. bash_completion .tests. test_bashcomp. TestBashComplet ion.test_ commit_ dashm OK 90ms plugins. upload. tests.test_ upload. TestFullUpload. test_full_ upload_ empty_tree( SFTPTransport, SFTPAbsoluteSer ver) OK 74ms TestCommonAnces tor.test_ get_history OK 65ms TestRevisionMet hods.test_ get_apparent_ authors OK 2ms plugins. bash_completion .tests. test_bashcomp. TestBashComplet ionInvoking. test_revspec_ tag_prefix OK 277ms plugins. quilt.tests. test_merge. TestMergeHook. test_auto_ apply_patches_ after_update OK 227ms plugins. fastimport. tests.test_ generic_ processor. TestImportToPac kRenameThenModi fy.test_ rename_ then_modify_ file_in_ new_dir( pack-0. 92) OK 389ms plugins. quilt.tests. test_wrapper. QuiltTests. test_applied_ empty OK 28ms plugins. fastimport. tests.test_ generic_ processor. TestImportToPac kRenameThenModi fy.test_ rename_ then_modify_ file_in_ subdir( 2a) OK 36ms plugins. fastimport. tests.test_ commands. TestFastExport. test_baseline_ option OK 173ms plugins. fastimport. tests.test_ generic_ processor. TestImportToPac kRename. test_rename_ symlink_ in_subdir( 1.9-rich- root) OK 327ms ec.TestRevision Spec_ancestor. test_no_ commits OK 150ms plugins. fastimport. tests.test_ commands. TestFastImport. test_file OK 48ms plugins. quilt.tests. test_wrapper. QuiltTests. test_unapplied_ multi OK 66ms plugins. fastimport. tests.test_ exporter. CheckRefnameRew riting. test_rewrite_ invalid OK 2ms plugins. upload. tests.test_ upload. TestFullUpload. test_ignore_ change_ file_into_ dir(SFTPTranspo rt,SFTPAbsolute Server) OK 187ms plugins. changelog_ merge.tests. test_changelog_ merge.TestChang eLogMerger. test_merge_ text_returns_ not_applicable OK 158ms plugins. repodebug. tests.SmokeTest s.test_ repo_keys OK 30ms plugins. commitfromnews. tests.test_ committemplate. TestCommitTempl ate.test_ changed_ NEWS OK 39ms plugins. email.tests. testemail. TestGetTo. test_command_ line OK 44ms plugins. email.tests. testemail. TestGetTo. test_send_ to_multiple OK 44ms plugins. upload. tests.test_ upload. TestFullUpload. test_ignore_ directory( SFTPTransport, SFTPAbsoluteSer ver) OK 133ms ec.TestRevision Spec_annotate. test_invalid_ line OK 188ms plugins. email.tests. testemail. TestGetTo. test_url_ set OK 44ms plugins. rewrite. tests.test_ blackbox. TestRebaseSimpl e.test_ continue_ nothing OK 178ms plugins. fastimport. tests.test_ commands. TestFastExport. test_tag_ rewriting OK 59ms plugins. fastimport. tests.test_ exporter. CheckRefFormatT ests.test_ valid OK 2ms plugins. fastimport. tests.test_ branch_ mapper. TestBranchMappe r.test_ git_to_ bzr_with_ slashes OK 1ms plugins. fastimport. tests.test_ generic_ proces. ..
breezy.
breezy.
test_revision.
test_revision.
breezy.
breezy.
breezy.
breezy.
breezy.
breezy.
breezy.
test_revisionsp
breezy.
breezy.
breezy.
breezy.
breezy.
breezy.
breezy.
breezy.
breezy.
breezy.
test_revisionsp
breezy.
breezy.
breezy.
breezy.
breezy.
breezy.