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
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.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :
Download full text (107.3 KiB)

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
breezy.plugins.bash_completion.tests.test_bashcomp.TestBashCompletion.test_commit_dashm OK 90ms
breezy.plugins.upload.tests.test_upload.TestFullUpload.test_full_upload_empty_tree(SFTPTransport,SFTPAbsoluteServer) OK 74ms
test_revision.TestCommonAncestor.test_get_history OK 65ms
test_revision.TestRevisionMethods.test_get_apparent_authors OK 2ms
breezy.plugins.bash_completion.tests.test_bashcomp.TestBashCompletionInvoking.test_revspec_tag_prefix OK 277ms
breezy.plugins.quilt.tests.test_merge.TestMergeHook.test_auto_apply_patches_after_update OK 227ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameThenModify.test_rename_then_modify_file_in_new_dir(pack-0.92) OK 389ms
breezy.plugins.quilt.tests.test_wrapper.QuiltTests.test_applied_empty OK 28ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameThenModify.test_rename_then_modify_file_in_subdir(2a) OK 36ms
breezy.plugins.fastimport.tests.test_commands.TestFastExport.test_baseline_option OK 173ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackRename.test_rename_symlink_in_subdir(1.9-rich-root) OK 327ms
test_revisionspec.TestRevisionSpec_ancestor.test_no_commits OK 150ms
breezy.plugins.fastimport.tests.test_commands.TestFastImport.test_file OK 48ms
breezy.plugins.quilt.tests.test_wrapper.QuiltTests.test_unapplied_multi OK 66ms
breezy.plugins.fastimport.tests.test_exporter.CheckRefnameRewriting.test_rewrite_invalid OK 2ms
breezy.plugins.upload.tests.test_upload.TestFullUpload.test_ignore_change_file_into_dir(SFTPTransport,SFTPAbsoluteServer) OK 187ms
breezy.plugins.changelog_merge.tests.test_changelog_merge.TestChangeLogMerger.test_merge_text_returns_not_applicable OK 158ms
breezy.plugins.repodebug.tests.SmokeTests.test_repo_keys OK 30ms
breezy.plugins.commitfromnews.tests.test_committemplate.TestCommitTemplate.test_changed_NEWS OK 39ms
breezy.plugins.email.tests.testemail.TestGetTo.test_command_line OK 44ms
breezy.plugins.email.tests.testemail.TestGetTo.test_send_to_multiple OK 44ms
breezy.plugins.upload.tests.test_upload.TestFullUpload.test_ignore_directory(SFTPTransport,SFTPAbsoluteServer) OK 133ms
test_revisionspec.TestRevisionSpec_annotate.test_invalid_line OK 188ms
breezy.plugins.email.tests.testemail.TestGetTo.test_url_set OK 44ms
breezy.plugins.rewrite.tests.test_blackbox.TestRebaseSimple.test_continue_nothing OK 178ms
breezy.plugins.fastimport.tests.test_commands.TestFastExport.test_tag_rewriting OK 59ms
breezy.plugins.fastimport.tests.test_exporter.CheckRefFormatTests.test_valid OK 2ms
breezy.plugins.fastimport.tests.test_branch_mapper.TestBranchMapper.test_git_to_bzr_with_slashes OK 1ms
breezy.plugins.fastimport.tests.test_generic_proces...

lp://staging/~jelmer/brz/abspath-fix updated
7875. By Jelmer Vernooij

Fix tests

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches