-----------------------------------------------------------------
Revision: 7bf6c45fc77ccc78a61da5d1656f451b797a4165
Ancestor: bd17dfdd8efa2f95fb7976446809215e80475089
Author: Timothy Brownawell  <[email protected]>
Date: 2009-01-11T16:52:21
Branch: net.venge.monotone

Added files:
        tests/noop_merge_into_workspace/__driver__.lua
Added directories:
        tests/noop_merge_into_workspace

ChangeLog: 

merge_into_workspace fails horribly when you try to merge in an ancestor.


monotone --db={your.database} diff 
--revision=bd17dfdd8efa2f95fb7976446809215e80475089 
--revision=7bf6c45fc77ccc78a61da5d1656f451b797a4165
----------------------------------------------------------------------


_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs

Reply via email to