To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 2255.2.32.
- Committer: Robert Collins
- Date: 2007-02-14 00:31:25 UTC
- mto: (2255.5.1 dirstate) (2321.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 2322.
- Revision ID: robertc@robertcollins.net-20070214003125-9k98ublv24yghhb1
Make test_clear_merge_conflicts pass for dirstate. This involved working
around an apparent race condition with file.truncate not truncating - the
dirstate file shrinks but later readers see the old file length and
content.
around an apparent race condition with file.truncate not truncating - the
dirstate file shrinks but later readers see the old file length and
content.
expand all
collapse all
added
removed
