/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 breezy/tests/test_shelf_ui.py

  • Committer: Gustav Hartvigsson
  • Date: 2021-01-09 21:36:27 UTC
  • Revision ID: gustav.hartvigsson@gmail.com-20210109213627-h1xwcutzy9m7a99b
Added 'Case Preserving Working Tree Use Cases' from Canonical Wiki

* Addod a page from the Canonical Bazaar wiki
  with information on the scmeatics of case
  perserving filesystems an a case insensitive
  filesystem works.
  
  * Needs re-work, but this will do as it is the
    same inforamoton as what was on the linked
    page in the currint documentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_shelf_ui.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
 
18
from io import BytesIO
18
19
import os
19
20
import sys
20
21
from textwrap import dedent
26
27
    shelf,
27
28
    tests,
28
29
    )
29
 
from ..sixish import (
30
 
    BytesIO,
31
 
    )
32
30
from . import script
33
31
from . import (
34
32
    features,
302
300
    def test_shelve_old_root_preserved(self):
303
301
        tree1 = self.make_branch_and_tree('tree1')
304
302
        tree1.commit('add root')
305
 
        tree1_root_id = tree1.get_root_id()
 
303
        tree1_root_id = tree1.path2id('')
306
304
        tree2 = self.make_branch_and_tree('tree2')
307
305
        rev2 = tree2.commit('add root')
308
 
        self.assertNotEqual(tree1_root_id, tree2.get_root_id())
 
306
        self.assertNotEqual(tree1_root_id, tree2.path2id(''))
309
307
        tree1.merge_from_branch(tree2.branch,
310
308
                                from_revision=revision.NULL_REVISION)
311
309
        tree1.commit('merging in tree2')
312
 
        self.assertEqual(tree1_root_id, tree1.get_root_id())
 
310
        self.assertEqual(tree1_root_id, tree1.path2id(''))
313
311
        # This is essentially assertNotRaises(InconsistentDelta)
314
312
        # With testtools 0.9.9, it can be rewritten as:
315
313
        # with ExpectedException(AssertionError,