← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_fetch.py

  • Committer: Andrew Bennetts
  • Date: 2011-07-11 02:06:18 UTC
  • mfrom: (6018 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6020.
  • Revision ID: andrew.bennetts@canonical.com-20110711020618-gcjgoeb5azwjrnu6
Merge lp:bzr/2.4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_fetch.py
200
200
             ('base', None, []),
201
201
             ('tip', None, [('unversion', 'my-root'),
202
202
                            ('unversion', ROOT_ID),
 
203
                            ('flush', None),
203
204
                            ('add', ('', 'my-root', 'directory', '')),
204
205
                            ]),
205
206
            ], root_id='my-root')
228
229
            # 'my-root' at root
229
230
             ('right', None, [('unversion', 'my-root'),
230
231
                              ('unversion', ROOT_ID),
 
232
                              ('flush', None),
231
233
                              ('add', ('', 'my-root', 'directory', ''))]),
232
234
             ('tip', ['base', 'right'], [('unversion', 'my-root'),
233
235
                            ('unversion', ROOT_ID),
 
236
                            ('flush', None),
234
237
                            ('add', ('', 'my-root', 'directory', '')),
235
238
                            ]),
236
239
            ], root_id='my-root')