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 breezy/tests/test_merge.py
- browse files at revision 7490.40.104
- compare with another revision
- compare with revision 7520.1.3
- download diff
- download tarball
- view history from revision 7490.40.104
- Committer: Breezy landing bot
- Author(s): Jelmer Vernooij
- Date: 2020-08-22 16:54:29 UTC
- mfrom: (7490.134.2 merge-copy)
- mto: (7520.1.3 merge-3.1) (7490.40.106 work) (7524.2.1 merge-3.1) (7526.2.1 merge-3.1)
- mto: This revision was merged to the branch mainline in revision 7521.
- Revision ID: breezy.the.bot@gmail.com-20200822165429-g3ivw8rcgdb0lxfb
Fix merging of copy operations.
Merged from https://code.launchpad.net/~jelmer/brz/merge-copy/+merge/389688
Merged from https://code.launchpad.net/~jelmer/brz/merge-copy/+merge/389688
added
removed
breezy/tests/test_merge.py
1433
1433
((u'a', [u'a', u'a']), u'a', u'a'),
1434
1434
((root_id, [root_id, root_id]), root_id, root_id),
1435
1435
((u'a', [u'a', u'a']), u'a', u'a'),
1436
((False, [False, False]), False, False)),
1436
((False, [False, False]), False, False),
1437
False),
1437
1438
], entries)
1438
1439
1439
1440
def test_not_in_base(self):
1479
1480
((None, [u'bar', u'bar']), u'bar', u'bar'),
1480
1481
((None, [root_id, root_id]), root_id, root_id),
1481
1482
((None, [u'bar', u'bar']), u'bar', u'bar'),
1482
((None, [False, False]), False, False)),
1483
((None, [False, False]), False, False),
1484
False),
1483
1485
], entries)
1484
1486
1485
1487
def test_not_in_this(self):
1512
1514
((u'a', [u'a', u'a']), u'a', None),
1513
1515
((root_id, [root_id, root_id]), root_id, None),
1514
1516
((u'a', [u'a', u'a']), u'a', None),
1515
((False, [False, False]), False, None)),
1517
((False, [False, False]), False, None),
1518
False),
1516
1519
], entries)
1517
1520
1518
1521
def test_file_not_in_one_lca(self):
1563
1566
((u'a', [u'a', u'a']), None, u'a'),
1564
1567
((root_id, [root_id, root_id]), None, root_id),
1565
1568
((u'a', [u'a', u'a']), None, u'a'),
1566
((False, [False, False]), None, False)),
1569
((False, [False, False]), None, False),
1570
False),
1567
1571
], entries)
1568
1572
1569
1573
def test_not_in_other_or_lca(self):
1629
1633
((u'foo', [u'foo', None]), None, u'foo'),
1630
1634
((root_id, [root_id, None]), None, root_id),
1631
1635
((u'foo', [u'foo', None]), None, 'foo'),
1632
((False, [False, None]), None, False)),
1636
((False, [False, None]), None, False),
1637
False),
1633
1638
], entries)
1634
1639
1635
1640
def test_only_in_one_lca(self):
1684
1689
((None, [None, None]), u'a', None),
1685
1690
((None, [None, None]), root_id, None),
1686
1691
((None, [None, None]), u'a', None),
1687
((None, [None, None]), False, None)),
1692
((None, [None, None]), False, None),
1693
False),
1688
1694
], entries)
1689
1695
1690
1696
def test_one_lca_supersedes(self):
1815
1821
[(b'foo-id', False,
1816
1822
((root_id, [root_id, root_id]), root_id, root_id),
1817
1823
((u'foo', [u'bar', u'foo']), u'bar', u'bing'),
1818
((False, [False, False]), False, False)),
1824
((False, [False, False]), False, False),
1825
False),
1819
1826
], entries)
1820
1827
1821
1828
def test_both_sides_revert(self):
1847
1854
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
1848
1855
((root_id, [root_id, root_id]), root_id, root_id),
1849
1856
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
1850
((False, [False, False]), False, False)),
1857
((False, [False, False]), False, False),
1858
False),
1851
1859
], entries)
1852
1860
1853
1861
def test_different_lca_resolve_one_side_updates_content(self):
1885
1893
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
1886
1894
((root_id, [root_id, root_id]), root_id, root_id),
1887
1895
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
1888
((False, [False, False]), False, False)),
1896
((False, [False, False]), False, False),
1897
False),
1889
1898
], entries)
1890
1899
1891
1900
def test_same_lca_resolution_one_side_updates_content(self):
1947
1956
((u'a', [u'a', u'a']), u'b', u'a'),
1948
1957
((root_id, [root_id, root_id]), root_id, root_id),
1949
1958
((u'a', [u'a', u'a']), u'b', u'a'),
1950
((False, [False, False]), False, False)),
1959
((False, [False, False]), False, False),
1960
False),
1951
1961
], entries)
1952
1962
1953
1963
def test_kind_changed(self):
1973
1983
((u'a', [u'a', u'a']), u'a', u'a'),
1974
1984
((root_id, [root_id, root_id]), root_id, root_id),
1975
1985
((u'a', [u'a', u'a']), u'a', u'a'),
1976
((False, [False, False]), False, False)),
1986
((False, [False, False]), False, False),
1987
False),
1977
1988
], entries)
1978
1989
1979
1990
def test_this_changed_kind(self):
2019
2030
((u'b', [u'b', u'b']), u'b', u'b'),
2020
2031
((root_id, [root_id, root_id]), root_id, root_id),
2021
2032
((u'b', [u'b', u'b']), u'b', u'b'),
2022
((False, [False, False]), False, False)),
2033
((False, [False, False]), False, False),
2034
False),
2023
2035
], entries)
2024
2036
2025
2037
def test_interesting_file_in_this(self):
2047
2059
((u'b', [u'b', u'b']), u'b', u'c'),
2048
2060
((root_id, [root_id, root_id]), root_id, root_id),
2049
2061
((u'b', [u'b', u'b']), u'b', u'c'),
2050
((False, [False, False]), False, False)),
2062
((False, [False, False]), False, False),
2063
False),
2051
2064
], entries)
2052
2065
2053
2066
def test_interesting_file_in_base(self):
2077
2090
((u'c', [u'b', u'b']), u'b', u'b'),
2078
2091
((root_id, [root_id, root_id]), root_id, root_id),
2079
2092
((u'c', [u'b', u'b']), u'b', u'b'),
2080
((False, [False, False]), False, False)),
2093
((False, [False, False]), False, False),
2094
False),
2081
2095
], entries)
2082
2096
2083
2097
def test_interesting_file_in_lca(self):
2105
2119
((u'b', [u'c', u'b']), u'b', u'b'),
2106
2120
((root_id, [root_id, root_id]), root_id, root_id),
2107
2121
((u'b', [u'c', u'b']), u'b', u'b'),
2108
((False, [False, False]), False, False)),
2122
((False, [False, False]), False, False),
2123
False),
2109
2124
], entries)
2110
2125
2111
2126
def test_interesting_files(self):
2130
2145
((u'b', [u'b', u'b']), u'b', u'b'),
2131
2146
((root_id, [root_id, root_id]), root_id, root_id),
2132
2147
((u'b', [u'b', u'b']), u'b', u'b'),
2133
((False, [False, False]), False, False)),
2148
((False, [False, False]), False, False),
2149
False),
2134
2150
], entries)
2135
2151
2136
2152
2440
2456
((u'foo', [u'barry', u'foo']), u'blah', u'barry'),
2441
2457
((root_id, [root_id, root_id]), root_id, root_id),
2442
2458
((u'foo', [u'barry', u'foo']), u'blah', u'barry'),
2443
((False, [False, False]), False, False)),
2459
((False, [False, False]), False, False),
2460
False),
2444
2461
], entries)
2445
2462
conflicts = wt.merge_from_branch(wt.branch, to_revision=b'F-id')
2446
2463
self.assertEqual(0, conflicts)
2545
2562
((None, [u'foo', None]), u'foo', u'foo'),
2546
2563
((None, [root_id, None]), root_id, root_id),
2547
2564
((None, [u'foo', None]), u'foo', u'foo'),
2548
((None, [False, None]), False, False)),
2565
((None, [False, None]), False, False),
2566
False),
2549
2567
], entries)
2550
2568
2551
2569
def test_symlink_all_wt(self):
2607
2625
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
2608
2626
((root_id, [root_id, root_id]), root_id, root_id),
2609
2627
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
2610
((False, [False, False]), False, False)),
2628
((False, [False, False]), False, False),
2629
False),
2611
2630
], entries)
2612
2631
2613
2632
def test_other_reverted_path_to_base(self):
2734
2753
((u'a', [u'a', u'b']), u'c', u'b'),
2735
2754
((root_id, [root_id, root_id]), root_id, root_id),
2736
2755
((u'a', [u'a', u'b']), u'c', u'b'),
2737
((False, [False, False]), False, False)),
2756
((False, [False, False]), False, False),
2757
False),
2738
2758
(b'foo-id', True,
2739
2759
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
2740
2760
((root_id, [root_id, root_id]), root_id, root_id),
2741
2761
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
2742
((False, [False, False]), False, False)),
2762
((False, [False, False]), False, False),
2763
False),
2743
2764
], entries)
2744
2765
2745
2766
def test_nested_tree_unmodified(self):
2854
2875
((u'sub', [u'sub', u'sub']), u'alt_sub', u'sub'),
2855
2876
((root_id, [root_id, root_id]), root_id, root_id),
2856
2877
((u'sub', [u'sub', u'sub']), u'alt_sub', u'sub'),
2857
((False, [False, False]), False, False)),
2878
((False, [False, False]), False, False),
2879
False),
2858
2880
], entries)
2859
2881
2860
2882
def test_nested_tree_subtree_renamed_and_modified(self):
2899
2921
((u'sub', [u'sub', u'sub']), u'alt_sub', u'sub'),
2900
2922
((root_id, [root_id, root_id]), root_id, root_id),
2901
2923
((u'sub', [u'sub', u'sub']), u'alt_sub', u'sub'),
2902
((False, [False, False]), False, False)),
2924
((False, [False, False]), False, False),
2925
False),
2903
2926
], entries)
2904
2927
2905
2928
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0