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

  • Committer: Aaron Bentley
  • Date: 2007-12-19 06:00:37 UTC
  • mto: This revision was merged to the branch mainline in revision 3135.
  • Revision ID: aaron.bentley@utoronto.ca-20071219060037-s2ouj41ysuu2kmmt
Avoid redundant conflict check

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1449
1449
            wt.add_conflicts(conflicts)
1450
1450
        except errors.UnsupportedOperation:
1451
1451
            pass
1452
 
        result = tt.apply()
 
1452
        result = tt.apply(no_conflicts=True)
1453
1453
    finally:
1454
1454
        tt.finalize()
1455
1455
        top_pb.finished()