[Monotone-commits-diffs] Revision fd11cc75081ce6cec78c50377f44d747a1ae77e5

[monotone]

-----------------------------------------------------------------
Revision: fd11cc75081ce6cec78c50377f44d747a1ae77e5
Ancestor: 0005a23e30a9c2d3024d94773eec433bf9acb770
Ancestor: 988e41109016916e509e375baf1663bfd1c7f7be
Author: address@hidden
Date: 2007-02-09T20:07:06
Branch: net.venge.monotone.experiment.summit07.lapo-gab

Added files:
        asciik.cc asciik.hh tests/locked_workspace/__driver__.lua
Added directories:
        tests/locked_workspace
Modified files:
        ChangeLog Makefile.am cmd_merging.cc diff_patch.cc
        diff_patch.hh file_io.cc netio.hh po/it.po
        tests/checkout_does_not_clobber_workspace/__driver__.lua
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right
        testsuite.lua work.cc
Modified attrs:
        asciik.cc asciik.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
0005a23e30a9c2d3024d94773eec433bf9acb770)
            to branch 'net.venge.monotone.experiment.summit07.lapo-gab' (head 
988e41109016916e509e375baf1663bfd1c7f7be)


monotone --db={your.database} diff 
--revision=0005a23e30a9c2d3024d94773eec433bf9acb770 
--revision=fd11cc75081ce6cec78c50377f44d747a1ae77e5
monotone --db={your.database} diff 
--revision=988e41109016916e509e375baf1663bfd1c7f7be 
--revision=fd11cc75081ce6cec78c50377f44d747a1ae77e5
----------------------------------------------------------------------