/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 bzrlib/tests/blackbox/test_dpush.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-16 08:42:21 UTC
  • mfrom: (5777.6.11 commit-lossy)
  • mto: This revision was merged to the branch mainline in revision 5792.
  • Revision ID: jelmer@samba.org-20110416084221-g9kgp1j4o9zo0kk4
merge commit-lossy

Show diffs side-by-side

added added

removed removed

Lines of Context:
66
66
 
67
67
        script.run_script(self, """
68
68
            $ bzr dpush -d dc d
 
69
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
 
70
            2>This may take some time. Upgrade the repositories to the same format for better performance.
69
71
            2>Pushed up to revision 2.
70
72
            $ bzr status dc
71
73
            """)
81
83
 
82
84
        script.run_script(self, '''
83
85
            $ bzr dpush -d dc d
 
86
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
 
87
            2>This may take some time. Upgrade the repositories to the same format for better performance.
84
88
            2>Pushed up to revision 2.
85
89
            $ bzr revno dc
86
90
            2
99
103
        self.build_tree_contents([("dc/foofile", "blaaaal")])
100
104
        script.run_script(self, '''
101
105
            $ bzr dpush -d dc d --no-strict
 
106
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
 
107
            2>This may take some time. Upgrade the repositories to the same format for better performance.
102
108
            2>Pushed up to revision 2.
103
109
            ''')
104
110
        self.assertFileEqual("blaaaal", "dc/foofile")