/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to python3.passing

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 15:47:10 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708154710-zebexq602tcer8hv
Fix more merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
python3.passing
13
13
breezy.plugins.bash_completion.tests.test_bashcomp.TestBashCodeGen.test_debug_output
14
14
breezy.plugins.bash_completion.tests.test_bashcomp.TestBashCodeGen.test_global_options
15
15
breezy.plugins.bash_completion.tests.test_bashcomp.TestDataCollector.test_global_options
 
16
breezy.plugins.changelog_merge.tests.test_changelog_merge.TestChangeLogMerger.test_merge_text_returns_success
16
17
breezy.plugins.changelog_merge.tests.test_changelog_merge.TestMergeCoreLogic.test_acceptance_bug_723968
17
18
breezy.plugins.changelog_merge.tests.test_changelog_merge.TestMergeCoreLogic.test_default_guess_edits
18
19
breezy.plugins.changelog_merge.tests.test_changelog_merge.TestMergeCoreLogic.test_more_complex_conflict
1459
1460
breezy.tests.blackbox.test_merge.TestMerge.test_merge_with_missing_file
1460
1461
breezy.tests.blackbox.test_merge.TestMerge.test_no_remember_dont_set_submit
1461
1462
breezy.tests.blackbox.test_merge.TestMerge.test_remember_sets_submit
 
1463
breezy.tests.blackbox.test_merge.TestMerge.test_weave_cherrypick
 
1464
breezy.tests.blackbox.test_merge.TestMerge.test_weave_conflict_leaves_base_this_other_files
1462
1465
breezy.tests.blackbox.test_missing.TestMissing.test_missing_directory
1463
1466
breezy.tests.blackbox.test_missing.TestMissing.test_missing_quiet
1464
1467
breezy.tests.blackbox.test_mkdir.TestMkdir.test_mkdir
1629
1632
breezy.tests.blackbox.test_repair_workingtree.TestRepairWorkingTree.test_repair_destroyed_with_revs_passes
1630
1633
breezy.tests.blackbox.test_repair_workingtree.TestRepairWorkingTree.test_repair_forced
1631
1634
breezy.tests.blackbox.test_revert.TestRevert.test_revert
 
1635
breezy.tests.blackbox.test_revert.TestRevert.test_revert_forget_merges
1632
1636
breezy.tests.blackbox.test_revert.TestRevert.test_revert_newly_added
1633
1637
breezy.tests.blackbox.test_revert.TestRevert.test_revert_removing_file
1634
1638
breezy.tests.blackbox.test_revision_history.TestRevisionHistory.test_revision_history
3020
3024
breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only_forward(RemoteGitBranchFormat)
3021
3025
breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only(RemoteGitBranchFormat)
3022
3026
breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude(BranchReferenceFormat)
 
3027
breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude(BzrBranchFormat4)
 
3028
breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude(BzrBranchFormat5)
 
3029
breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude(BzrBranchFormat6)
 
3030
breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude(BzrBranchFormat7)
 
3031
breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude(BzrBranchFormat8)
3023
3032
breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude_forward(BranchReferenceFormat)
3024
3033
breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude_forward(BzrBranchFormat4)
3025
3034
breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude_forward(BzrBranchFormat5)
3514
3523
breezy.tests.per_branch.test_pull.TestPull.test_pull_stop_revision_merges_and_fetches_tags(BranchReferenceFormat)
3515
3524
breezy.tests.per_branch.test_pull.TestPull.test_pull_stop_revision_merges_and_fetches_tags(BzrBranchFormat4)
3516
3525
breezy.tests.per_branch.test_pull.TestPull.test_pull_stop_revision_merges_and_fetches_tags(BzrBranchFormat5)
 
3526
breezy.tests.per_branch.test_pull.TestPull.test_pull_stop_revision_merges_and_fetches_tags(BzrBranchFormat6)
 
3527
breezy.tests.per_branch.test_pull.TestPull.test_pull_stop_revision_merges_and_fetches_tags(BzrBranchFormat7)
 
3528
breezy.tests.per_branch.test_pull.TestPull.test_pull_stop_revision_merges_and_fetches_tags(BzrBranchFormat8)
 
3529
breezy.tests.per_branch.test_pull.TestPull.test_pull_stop_revision_merges_and_fetches_tags(LocalGitBranchFormat)
3517
3530
breezy.tests.per_branch.test_pull.TestPull.test_pull_stop_revision_merges_and_fetches_tags(RemoteGitBranchFormat)
3518
3531
breezy.tests.per_branch.test_pull.TestPull.test_pull_updates_checkout_and_master(BranchReferenceFormat)
3519
3532
breezy.tests.per_branch.test_pull.TestPull.test_pull_updates_checkout_and_master(BzrBranchFormat4)
6708
6721
breezy.tests.per_lock.test_temporary_write_lock.TestTemporaryWriteLock.test_fails_when_locked(fcntl)
6709
6722
breezy.tests.per_lock.test_temporary_write_lock.TestTemporaryWriteLock.test_is_write_locked(fcntl)
6710
6723
breezy.tests.per_merger.TestHookMergeFileContent.test_can_access_this_other_and_base_versions(diff3)
 
6724
breezy.tests.per_merger.TestHookMergeFileContent.test_can_access_this_other_and_base_versions(lca)
6711
6725
breezy.tests.per_merger.TestHookMergeFileContent.test_can_access_this_other_and_base_versions(merge3)
 
6726
breezy.tests.per_merger.TestHookMergeFileContent.test_can_access_this_other_and_base_versions(weave)
6712
6727
breezy.tests.per_merger.TestMergeImplementation.test_merge_move_and_change(diff3)
6713
6728
breezy.tests.per_merger.TestMergeImplementation.test_merge_move_and_change(merge3)
 
6729
breezy.tests.per_merger.TestMergeImplementation.test_merge_move_and_change(weave)
6714
6730
breezy.tests.per_merger.TestMergeImplementation.test_merge_specific_file(diff3)
 
6731
breezy.tests.per_merger.TestMergeImplementation.test_merge_specific_file(lca)
6715
6732
breezy.tests.per_merger.TestMergeImplementation.test_merge_specific_file(merge3)
 
6733
breezy.tests.per_merger.TestMergeImplementation.test_merge_specific_file(weave)
6716
6734
breezy.tests.per_merger.TestMergeImplementation.test_merge_with_existing_limbo_empty(diff3)
6717
6735
breezy.tests.per_merger.TestMergeImplementation.test_merge_with_existing_limbo_empty(lca)
6718
6736
breezy.tests.per_merger.TestMergeImplementation.test_merge_with_existing_limbo_empty(merge3)
6731
6749
breezy.tests.per_merger.TestMergeImplementation.test_merge_with_pending_deletion_non_empty(weave)
6732
6750
breezy.tests.per_merger.TestMergeImplementation.test_modify_conflicts_with_delete(diff3)
6733
6751
breezy.tests.per_merger.TestMergeImplementation.test_modify_conflicts_with_delete(merge3)
 
6752
breezy.tests.per_merger.TestMergeImplementation.test_modify_conflicts_with_delete(weave)
6734
6753
breezy.tests.permute_tests_for_extension.<locals>.FailWithoutFeature.test_fail
6735
6754
breezy.tests.per_pack_repository.TestKeyDependencies.test_key_dependencies_cleared_on_abort(1.6)
6736
6755
breezy.tests.per_pack_repository.TestKeyDependencies.test_key_dependencies_cleared_on_abort(1.6.1-rich-root)
14964
14983
breezy.tests.per_tree.test_tree.TestPlanFileMerge.test_plan_file_merge(DirStateRevisionTree,WT4)
14965
14984
breezy.tests.per_tree.test_tree.TestPlanFileMerge.test_plan_file_merge(DirStateRevisionTree,WT5)
14966
14985
breezy.tests.per_tree.test_tree.TestPlanFileMerge.test_plan_file_merge(GitWorkingTreeFormat)
 
14986
breezy.tests.per_tree.test_tree.TestPlanFileMerge.test_plan_file_merge(PreviewTree)
 
14987
breezy.tests.per_tree.test_tree.TestPlanFileMerge.test_plan_file_merge(PreviewTreePost)
14967
14988
breezy.tests.per_tree.test_tree.TestPlanFileMerge.test_plan_file_merge(RevisionTree)
 
14989
breezy.tests.per_tree.test_tree.TestPlanFileMerge.test_plan_file_merge(WorkingTreeFormat2)
 
14990
breezy.tests.per_tree.test_tree.TestPlanFileMerge.test_plan_file_merge(WorkingTreeFormat3)
 
14991
breezy.tests.per_tree.test_tree.TestPlanFileMerge.test_plan_file_merge(WorkingTreeFormat4)
 
14992
breezy.tests.per_tree.test_tree.TestPlanFileMerge.test_plan_file_merge(WorkingTreeFormat5)
 
14993
breezy.tests.per_tree.test_tree.TestPlanFileMerge.test_plan_file_merge(WorkingTreeFormat6)
14968
14994
breezy.tests.per_tree.test_tree.TestReference.test_get_reference_revision(DirStateRevisionTree,WT4)
14969
14995
breezy.tests.per_tree.test_tree.TestReference.test_get_reference_revision(DirStateRevisionTree,WT5)
14970
14996
breezy.tests.per_tree.test_tree.TestReference.test_get_reference_revision(GitWorkingTreeFormat)
15967
15993
breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_excludes_modified_files(WorkingTreeFormat4)
15968
15994
breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_excludes_modified_files(WorkingTreeFormat5)
15969
15995
breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_excludes_modified_files(WorkingTreeFormat6)
 
15996
breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_pending_merge_fails(GitWorkingTreeFormat)
15970
15997
breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_pending_merge_fails(WorkingTreeFormat2)
15971
15998
breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_pending_merge_fails(WorkingTreeFormat3)
15972
15999
breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_pending_merge_fails(WorkingTreeFormat4)
16370
16397
breezy.tests.per_workingtree.test_get_file_mtime.TestGetFileMTime.test_missing(WorkingTreeFormat6)
16371
16398
breezy.tests.per_workingtree.test_get_file_mtime.TestGetFileMTime.test_missing(WorkingTreeFormat6,remote)
16372
16399
breezy.tests.per_workingtree.test_get_parent_ids.TestGetParentIds.test_pending_merges(GitWorkingTreeFormat)
 
16400
breezy.tests.per_workingtree.test_get_parent_ids.TestGetParentIds.test_pending_merges(WorkingTreeFormat2)
 
16401
breezy.tests.per_workingtree.test_get_parent_ids.TestGetParentIds.test_pending_merges(WorkingTreeFormat3)
 
16402
breezy.tests.per_workingtree.test_get_parent_ids.TestGetParentIds.test_pending_merges(WorkingTreeFormat4)
 
16403
breezy.tests.per_workingtree.test_get_parent_ids.TestGetParentIds.test_pending_merges(WorkingTreeFormat5)
 
16404
breezy.tests.per_workingtree.test_get_parent_ids.TestGetParentIds.test_pending_merges(WorkingTreeFormat6)
 
16405
breezy.tests.per_workingtree.test_get_parent_ids.TestGetParentIds.test_pending_merges(WorkingTreeFormat6,remote)
16373
16406
breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_add(GitWorkingTreeFormat)
16374
16407
breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_add(WorkingTreeFormat2)
16375
16408
breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_add(WorkingTreeFormat3)
16595
16628
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_empty(WorkingTreeFormat4)
16596
16629
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_empty(WorkingTreeFormat5)
16597
16630
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_empty(WorkingTreeFormat6)
 
16631
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_to_revision(GitWorkingTreeFormat)
16598
16632
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_to_revision(WorkingTreeFormat2)
16599
16633
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_to_revision(WorkingTreeFormat3)
16600
16634
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_to_revision(WorkingTreeFormat4)
16601
16635
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_to_revision(WorkingTreeFormat5)
16602
16636
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_to_revision(WorkingTreeFormat6)
 
16637
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_type(GitWorkingTreeFormat)
 
16638
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_type(WorkingTreeFormat2)
 
16639
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_type(WorkingTreeFormat3)
 
16640
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_type(WorkingTreeFormat4)
 
16641
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_type(WorkingTreeFormat5)
 
16642
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_merge_type(WorkingTreeFormat6)
 
16643
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_smoking_merge(GitWorkingTreeFormat)
16603
16644
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_smoking_merge(WorkingTreeFormat2)
16604
16645
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_smoking_merge(WorkingTreeFormat3)
16605
16646
breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_smoking_merge(WorkingTreeFormat4)
17279
17320
breezy.tests.per_workingtree.test_revision_tree.TestRevisionTree.test_get_nonzeroth_basis_tree_via_revision_tree(WorkingTreeFormat4)
17280
17321
breezy.tests.per_workingtree.test_revision_tree.TestRevisionTree.test_get_nonzeroth_basis_tree_via_revision_tree(WorkingTreeFormat5)
17281
17322
breezy.tests.per_workingtree.test_revision_tree.TestRevisionTree.test_get_nonzeroth_basis_tree_via_revision_tree(WorkingTreeFormat6)
 
17323
breezy.tests.per_workingtree.test_revision_tree.TestRevisionTree.test_get_pending_merge_revision_tree(GitWorkingTreeFormat)
17282
17324
breezy.tests.per_workingtree.test_revision_tree.TestRevisionTree.test_get_pending_merge_revision_tree(WorkingTreeFormat2)
17283
17325
breezy.tests.per_workingtree.test_revision_tree.TestRevisionTree.test_get_pending_merge_revision_tree(WorkingTreeFormat3)
17284
17326
breezy.tests.per_workingtree.test_revision_tree.TestRevisionTree.test_get_pending_merge_revision_tree(WorkingTreeFormat4)
17712
17754
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat5)
17713
17755
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat6)
17714
17756
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat6,remote)
 
17757
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clear_merge_conflicts(GitWorkingTreeFormat)
17715
17758
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clear_merge_conflicts(WorkingTreeFormat2)
17716
17759
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clear_merge_conflicts(WorkingTreeFormat3)
17717
17760
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clear_merge_conflicts(WorkingTreeFormat4)
17834
17877
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_lock_locks_branch(WorkingTreeFormat5)
17835
17878
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_lock_locks_branch(WorkingTreeFormat6)
17836
17879
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_lock_locks_branch(WorkingTreeFormat6,remote)
 
17880
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_conflicts(GitWorkingTreeFormat)
17837
17881
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_conflicts(WorkingTreeFormat2)
17838
17882
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_conflicts(WorkingTreeFormat3)
17839
17883
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_conflicts(WorkingTreeFormat4)
17840
17884
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_conflicts(WorkingTreeFormat5)
17841
17885
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_conflicts(WorkingTreeFormat6)
17842
17886
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified_detects_corruption(GitWorkingTreeFormat)
 
17887
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified_detects_corruption(WorkingTreeFormat2)
 
17888
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified_detects_corruption(WorkingTreeFormat3)
 
17889
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified_detects_corruption(WorkingTreeFormat4)
 
17890
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified_detects_corruption(WorkingTreeFormat5)
 
17891
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified_detects_corruption(WorkingTreeFormat6)
 
17892
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified_detects_corruption(WorkingTreeFormat6,remote)
17843
17893
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified(GitWorkingTreeFormat)
17844
17894
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_missing_file_sha1(WorkingTreeFormat2)
17845
17895
breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_missing_file_sha1(WorkingTreeFormat3)
21849
21899
breezy.tests.test_lock.TestOSLock.test_write_locks_are_exclusive(fcntl)
21850
21900
breezy.tests.test_lock.TestOSLock.test_write_locks_block_read_lock(fcntl)
21851
21901
breezy.tests.test_log.TestFormatSignatureValidity.test_format_signature_validity_utf
 
21902
breezy.tests.test_log.TestLineLogFormatter.test_line_log_single_merge_revision
 
21903
breezy.tests.test_log.TestLineLogFormatterWithMergeRevisions.test_line_merge_revs_log_single_merge_revision
 
21904
breezy.tests.test_log.TestLineLogFormatterWithMergeRevisions.test_line_merge_revs_log_with_merges
21852
21905
breezy.tests.test_log.TestLogDefaults.test_default_log_level
21853
21906
breezy.tests.test_log.TestLogFormatter.test_short_author
21854
21907
breezy.tests.test_log.TestLogFormatter.test_short_author_from_authors
21856
21909
breezy.tests.test_log.TestLogFormatter.test_short_committer
21857
21910
breezy.tests.test_log.TestLogWithBugs.test_bugs_handler_present
21858
21911
breezy.tests.test_log.TestLongLogFormatter.test_error_in_properties_handler
 
21912
breezy.tests.test_log.TestLongLogFormatter.test_merges_are_indented_by_level
 
21913
breezy.tests.test_log.TestLongLogFormatter.test_verbose_merge_revisions_contain_deltas
21859
21914
breezy.tests.test_log.TestReverseByDepth.test_mainline_revisions
21860
21915
breezy.tests.test_log.TestReverseByDepth.test_merged_revisions
21861
21916
breezy.tests.test_log.TestReverseByDepth.test_merged_without_child_revisions
21862
21917
breezy.tests.test_log.TestReverseByDepth.test_shifted_merged_revisions
 
21918
breezy.tests.test_log.TestShortLogFormatter.test_short_log_single_merge_revision
 
21919
breezy.tests.test_log.TestShortLogFormatter.test_short_log_with_merges
 
21920
breezy.tests.test_log.TestShortLogFormatter.test_short_log_with_merges_and_advice
 
21921
breezy.tests.test_log.TestShortLogFormatter.test_short_log_with_merges_and_range
 
21922
breezy.tests.test_log.TestShortLogFormatterWithMergeRevisions.test_short_merge_revs_log_single_merge_revision
 
21923
breezy.tests.test_log.TestShortLogFormatterWithMergeRevisions.test_short_merge_revs_log_with_merges
21863
21924
breezy.tests.test_log.TestShowLog.test_cur_revno
21864
21925
breezy.tests.test_log.TestShowLog.test_deltas_in_merge_revisions
21865
21926
breezy.tests.test_log.TestShowLog.test_empty_branch
21959
22020
breezy.tests.test_merge3.TestMerge3.test_replace_clash
21960
22021
breezy.tests.test_merge3.TestMerge3.test_replace_multi
21961
22022
breezy.tests.test_merge3.TestMerge3.test_reprocess_and_base
 
22023
breezy.tests.test_merge_core.FunctionalMergeTest.test_conflicts
21962
22024
breezy.tests.test_merge_core.FunctionalMergeTest.test_merge_create_before_rename
21963
22025
breezy.tests.test_merge_core.FunctionalMergeTest.test_merge_delete_and_add_same
21964
22026
breezy.tests.test_merge_core.FunctionalMergeTest.test_merge_delete_before_rename_to_temp
21973
22035
breezy.tests.test_merge_core.MergeTest.test_change_name
21974
22036
breezy.tests.test_merge_core.MergeTest.test_contents_merge
21975
22037
breezy.tests.test_merge_core.MergeTest.test_contents_merge2
 
22038
breezy.tests.test_merge_core.MergeTest.test_contents_merge3
21976
22039
breezy.tests.test_merge_core.MergeTest.test_file_moves
21977
22040
breezy.tests.test_merge_core.MergeTest.test_merge_one
21978
22041
breezy.tests.test_merge_core.MergeTest.test_merge_one_renamed
21979
22042
breezy.tests.test_merge_core.MergeTest.test_new_suffix
21980
22043
breezy.tests.test_merge_core.MergeTest.test_no_passive_add
21981
22044
breezy.tests.test_merge_core.MergeTest.test_perms_merge
 
22045
breezy.tests.test_merge_core.MergeTest.test_reprocess_weave
21982
22046
breezy.tests.test_merge_core.MergeTest.test_spurious_conflict
21983
22047
breezy.tests.test_merge_core.MergeTest.test_symlink_conflicts
21984
22048
breezy.tests.test_merge_core.MergeTest.test_symlink_merge
22011
22075
breezy.tests.test_merge_directive.TestMergeDirective2.test_deserialize_junk
22012
22076
breezy.tests.test_merge_directive.TestMergeDirective2.test_deserialize_leading_junk
22013
22077
breezy.tests.test_merge_directive.TestMergeDirective2.test_merge_source
 
22078
breezy.tests.test_merge_directive.TestParseOldMergeDirective2.test_parse_old_merge_directive
22014
22079
breezy.tests.test_merge.TestConfigurableFileMerger.test_affected_files_cached
22015
22080
breezy.tests.test_merge.TestConfigurableFileMerger.test_hook_called_for_text_conflicts
22016
22081
breezy.tests.test_merge.TestConfigurableFileMerger.test_hook_not_called_for_other_files
22036
22101
breezy.tests.test_merge.TestMergerEntriesLCAOnDisk.test_modified_symlink
22037
22102
breezy.tests.test_merge.TestMergerEntriesLCAOnDisk.test_nested_tree_subtree_modified
22038
22103
breezy.tests.test_merge.TestMergerEntriesLCAOnDisk.test_nested_tree_subtree_renamed
 
22104
breezy.tests.test_merge.TestMergerEntriesLCAOnDisk.test_nested_tree_subtree_renamed_and_modified
22039
22105
breezy.tests.test_merge.TestMergerEntriesLCAOnDisk.test_nested_tree_unmodified
22040
22106
breezy.tests.test_merge.TestMergerEntriesLCAOnDisk.test_other_deletes_lca_renames
22041
22107
breezy.tests.test_merge.TestMergerEntriesLCAOnDisk.test_other_modified_content
22105
22171
breezy.tests.test_merge.TestMerge.test_undo
22106
22172
breezy.tests.test_merge.TestMerge.test_unrelated
22107
22173
breezy.tests.test_merge.TestMerge.test_weave_cannot_reverse_cherrypick
 
22174
breezy.tests.test_merge.TestMerge.test_weave_cherrypick
 
22175
breezy.tests.test_merge.TestPlanMerge.test_base_from_plan
 
22176
breezy.tests.test_merge.TestPlanMerge.test_plan_lca_merge
 
22177
breezy.tests.test_merge.TestPlanMerge.test_plan_lca_merge_uncommitted_files
 
22178
breezy.tests.test_merge.TestPlanMerge.test_plan_lca_merge_with_base
 
22179
breezy.tests.test_merge.TestPlanMerge.test_plan_lca_merge_with_criss_cross
 
22180
breezy.tests.test_merge.TestPlanMerge.test_plan_lca_merge_with_null
 
22181
breezy.tests.test_merge.TestPlanMerge.test_plan_merge
 
22182
breezy.tests.test_merge.TestPlanMerge.test_plan_merge_2_tail_triple_ancestors
22108
22183
breezy.tests.test_merge.TestPlanMerge.test_plan_merge_cherrypick
 
22184
breezy.tests.test_merge.TestPlanMerge.test_plan_merge_criss_cross
 
22185
breezy.tests.test_merge.TestPlanMerge.test_plan_merge_insert_order
22109
22186
breezy.tests.test_merge.TestPlanMerge.test_plan_merge_no_common_ancestor
 
22187
breezy.tests.test_merge.TestPlanMerge.test_plan_merge_tail_ancestors
 
22188
breezy.tests.test_merge.TestPlanMerge.test_plan_merge_uncommitted_files
 
22189
breezy.tests.test_merge.TestPlanMerge.test_plan_merge_with_base
 
22190
breezy.tests.test_merge.TestPlanMerge.test_plan_merge_with_delete_and_change
 
22191
breezy.tests.test_merge.TestPlanMerge.test_plan_merge_with_move_and_change
22110
22192
breezy.tests.test_merge.TestPlanMerge.test__prune_tails
22111
22193
breezy.tests.test_merge.TestPlanMerge.test__remove_external_references
22112
22194
breezy.tests.test_merge.TestPlanMerge.test_subtract_plans
22124
22206
breezy.tests.test_mergetools.TestInvoke.test_invoke_expands_exe_path
22125
22207
breezy.tests.test_mergetools.TestInvoke.test_success
22126
22208
breezy.tests.test_mergetools.TestInvoke.test_success_tempfile
 
22209
breezy.tests.test_missing.TestFindUnmerged.test_include_merged
22127
22210
breezy.tests.test_missing.TestFindUnmerged.test_merged
22128
22211
breezy.tests.test_missing.TestFindUnmerged.test_one_ahead
22129
22212
breezy.tests.test_missing.TestFindUnmerged.test_restrict
22130
22213
breezy.tests.test_missing.TestFindUnmerged.test_revision_range
22131
22214
breezy.tests.test_missing.TestFindUnmerged.test_same_branch
 
22215
breezy.tests.test_missing.TestMissing.test_find_unmerged
22132
22216
breezy.tests.test_msgeditor.MsgEditorTest.test_commit_template
22133
22217
breezy.tests.test_msgeditor.MsgEditorTest.test_commit_template_encoded
22134
22218
breezy.tests.test_msgeditor.MsgEditorTest.test_commit_template_pending_merges
24053
24137
breezy.tests.test_subsume.TestWorkingTree.test_old_knit1_failure
24054
24138
breezy.tests.test_subsume.TestWorkingTree.test_subsume_failure
24055
24139
breezy.tests.test_switch.TestSwitchHeavyweight.test_switch_after_branch_moved
 
24140
breezy.tests.test_switch.TestSwitchHeavyweight.test_switch_configurable_file_merger
24056
24141
breezy.tests.test_switch.TestSwitchHeavyweight.test_switch_updates
24057
24142
breezy.tests.test_switch.TestSwitchHeavyweight.test_switch_when_pending_merges
24058
24143
breezy.tests.test_switch.TestSwitchHeavyweight.test_switch_with_local_commits
24059
24144
breezy.tests.test_switch.TestSwitch.test_switch_after_branch_moved
 
24145
breezy.tests.test_switch.TestSwitch.test_switch_configurable_file_merger
24060
24146
breezy.tests.test_switch.TestSwitch.test_switch_updates
24061
24147
breezy.tests.test_switch.TestSwitch.test_switch_when_pending_merges
24062
24148
breezy.tests.test_symbol_versioning.TestDeprecationWarnings.test_deprecated_dict
24224
24310
breezy.tests.test_transform.TestSerializeTransform.test_get_parents_texts
24225
24311
breezy.tests.test_transform.TestTransformHooks.test_post_commit_hooks
24226
24312
breezy.tests.test_transform.TestTransformHooks.test_pre_commit_hooks
 
24313
breezy.tests.test_transform.TestTransformMerge.test_file_merge
 
24314
breezy.tests.test_transform.TestTransformMerge.test_filename_merge
 
24315
breezy.tests.test_transform.TestTransformMerge.test_filename_merge_conflicts
24227
24316
breezy.tests.test_transform.TestTransformMissingParent.test_non_versioned_file_create_conflict
24228
24317
breezy.tests.test_transform.TestTransformMissingParent.test_resolve_create_parent_for_versioned_file
24229
24318
breezy.tests.test_transform.TestTransformPreview.test_all_file_ids
24264
24353
breezy.tests.test_transform.TestTransformPreview.test_path2id_created
24265
24354
breezy.tests.test_transform.TestTransformPreview.test_path2id_deleted_unchanged
24266
24355
breezy.tests.test_transform.TestTransformPreview.test_path2id_renamed_parent
 
24356
breezy.tests.test_transform.TestTransformPreview.test_plan_file_merge
 
24357
breezy.tests.test_transform.TestTransformPreview.test_plan_file_merge_revision_tree
24267
24358
breezy.tests.test_transform.TestTransformPreview.test_specific_files
24268
24359
breezy.tests.test_transform.TestTransformPreview.test_stored_kind
24269
24360
breezy.tests.test_transform.TestTransformPreview.test_transform_conflicts
24533
24624
breezy.tests.test_uncommit.TestUncommit.test_uncommit_bound_local
24534
24625
breezy.tests.test_uncommit.TestUncommit.test_uncommit_keep_tags
24535
24626
breezy.tests.test_uncommit.TestUncommit.test_uncommit_remove_tags
 
24627
breezy.tests.test_uncommit.TestUncommit.test_uncommit_remove_tags_keeps_pending_merges
24536
24628
breezy.tests.test_uncommit.TestUncommit.test_uncommit_unbound_local
24537
24629
breezy.tests.test_upgrade_stacked.TestStackUpgrade.test_stack_upgrade(knit, 1.6)
24538
24630
breezy.tests.test_upgrade.TestSmartUpgrade.test_upgrade_repo_with_branches