← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-16 15:37:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6146.
  • Revision ID: jriddell@canonical.com-20110916153758-y936k3hysjc1tphy
update tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
1080
1080
# Create a debian branch based on trunk
1081
1081
$ cd ..
1082
1082
$ bzr branch trunk -r 1 debian
1083
 
2>Branched 1 revision(s).
 
1083
2>Branched 1 revision.
1084
1084
$ cd debian
1085
1085
$ mkdir dir
1086
1086
$ bzr add