← Back to branch summary

~bzr/bzr-merge-into/trunk

« back to all changes in this revision

Viewing changes to test_bb_merge_into.py

  • Committer: John Arbash Meinel
  • Date: 2007-02-02 22:36:36 UTC
  • Revision ID: john@arbash-meinel.com-20070202223636-l74e7bpf7aly2xai
Always generate a new id for the root directory.
The problem is Knit1 doesn't create a knit for tree_root,
so commit fails if it is moved.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test_bb_merge_into.py
59
59
        # inventory reloaded
60
60
        project_wt.read_working_inventory()
61
61
        project_wt.lock_read()
 
62
        new_lib1_id = project_wt.inventory.path2id('lib1')
62
63
        try:
63
64
            # The lib-1 revision should be merged into this one
64
65
            self.assertEqual(['project-1', 'lib-1'],
70
71
                         ('README', 'V', 'file', 'readme-id'),
71
72
                         ('dir', 'V', 'directory', 'dir-id'),
72
73
                         ('dir/file.c', 'V', 'file', 'file.c-id'),
73
 
                         ('lib1', 'V', 'directory', 'lib1-root-id'),
 
74
                         ('lib1', 'V', 'directory', new_lib1_id),
74
75
                         ('lib1/Makefile', 'V', 'file', 'makefile-lib-id'),
75
76
                         ('lib1/README', 'V', 'file', 'readme-lib-id'),
76
77
                         ('lib1/foo.c', 'V', 'file', 'foo.c-lib-id'),
89
90
        # inventory reloaded
90
91
        project_wt.read_working_inventory()
91
92
        project_wt.lock_read()
 
93
        new_lib1_id = project_wt.inventory.path2id('dir/lib1')
92
94
        try:
93
95
            # The lib-1 revision should be merged into this one
94
96
            self.assertEqual(['project-1', 'lib-1'],
100
102
                         ('README', 'V', 'file', 'readme-id'),
101
103
                         ('dir', 'V', 'directory', 'dir-id'),
102
104
                         ('dir/file.c', 'V', 'file', 'file.c-id'),
103
 
                         ('dir/lib1', 'V', 'directory', 'lib1-root-id'),
 
105
                         ('dir/lib1', 'V', 'directory', new_lib1_id),
104
106
                         ('dir/lib1/Makefile', 'V', 'file', 'makefile-lib-id'),
105
107
                         ('dir/lib1/README', 'V', 'file', 'readme-lib-id'),
106
108
                         ('dir/lib1/foo.c', 'V', 'file', 'foo.c-lib-id'),