← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Aaron Bentley
  • Date: 2005-09-29 21:07:17 UTC
  • mfrom: (1393.1.6)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: abentley@panoramicfeedback.com-20050929210717-cd73981590f17017
Merged the weave changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
45
45
        b.commit('commit pointless revision with one file',
46
46
                 allow_pointless=True)
47
47
 
48
 
        b.add_pending_merge('mbp@892739123-2005-123123')
49
 
        b.commit('commit new merge with no text changes',
50
 
                 allow_pointless=False)
51
48
        
52
49
 
53
50
 
74
71
 
75
72
    def test_pending_merges(self):
76
73
        """Tracking pending-merged revisions."""
 
74
        print "GHOST SUPPORT REMOVED"
 
75
        return
 
76
 
77
77
        b = Branch.initialize('.')
78
78
 
79
79
        self.assertEquals(b.pending_merges(), [])
94
94
                           'wibble@fofof--20050401--1928390812')
95
95
        # list should be cleared when we do a commit
96
96
        self.assertEquals(b.pending_merges(), [])
97
 
        
 
97
 
 
98
 
 
99
class MoreTests(TestCaseInTempDir):
 
100
 
98
101
    def test_revert(self):
99
102
        """Test selected-file revert"""
100
103
        b = Branch.initialize('.')
195
198
            # directory, or nearby
196
199
            os.chdir(dtmp)
197
200
 
198
 
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
 
201
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
 
202
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
199
203
 
200
204
            self.assertEqual(rp('foo'), 'foo')
201
205