/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_bundle.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-27 01:09:28 UTC
  • mfrom: (6883.22.13 conflicts)
  • Revision ID: breezy.the.bot@gmail.com-20180327010928-z890ialzaf65trnq
Change arguments for 'modify' and 'unversion' in BranchBuilder.build_snapshot from a file-id to path.

Merged from https://code.launchpad.net/~jelmer/brz/conflicts/+merge/341069

Show diffs side-by-side

added added

removed removed

Lines of Context:
1517
1517
            ('add', ('file', 'file-id', 'file', 'original content\n')),
1518
1518
            ], revision_id='a@cset-0-1')
1519
1519
        builder.build_snapshot(['a@cset-0-1'], [
1520
 
            ('modify', ('file-id', 'new-content\n')),
 
1520
            ('modify', ('file', 'new-content\n')),
1521
1521
            ], revision_id='a@cset-0-2a')
1522
1522
        builder.build_snapshot(['a@cset-0-1'], [
1523
1523
            ('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),