/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 doc/developers/profiling.txt

  • Committer: John Arbash Meinel
  • Date: 2009-05-01 18:09:24 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090501180924-bco4vmhymopg5lls
Different sides deleting different amounts is now a conflict.

This is because the final 'lines' are different, but something occurred
on each side.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/profiling.txt
50
50
global option.
51
51
 
52
52
This writes messages into ``~/.bzr.log``.
53
 
At present this only logs actions relating to the on-disk lockdir.  It
 
53
At present this only logs actions relating to the on-disk lockdir.  It 
54
54
doesn't describe actions on in-memory lock counters, or OS locks (which
55
55
are used for dirstate.)
56
56