[Monotone-commits-diffs] Revision 00cf1061e7d9bd630c12cb26f2dc1ef09d350d4b

[monotone]

-----------------------------------------------------------------
Revision: 00cf1061e7d9bd630c12cb26f2dc1ef09d350d4b
Ancestor: 4aa81d8b513c8a4cfa2ae498d166699da9e2b924
Author: Timothy Brownawell  <address@hidden>
Date: 2006-07-05T21:13:57
Branch: net.venge.monotone

Modified files:
        ChangeLog randomfile.hh

ChangeLog: 

2006-07-05  Timothy Brownawell  <address@hidden>
        * randomfile.hh (file_randomizer::build_random_fork): When generating
        two consecutive 'insert' hunks where the inserts occur on opposite
        sides of the fork, insert spacer lines between the hunks. This
        prevents it from generating some real conflicts that were making some
        of the unit_tests (which expect cleanly mergable files) fail.

txtqfc01Kfq8n.txt
Description: Diff [4aa81d8b513c8a4cfa2ae498d166699da9e2b924] -> [00cf1061e7d9bd630c12cb26f2dc1ef09d350d4b]