-----------------------------------------------------------------
Revision: 1a8afa25119c9c88dfd031c7fd834f6f99507ecf
Ancestor: 821bdbb6e7dccef5f2565788534566306f400601
Author: Timothy Brownawell <[email protected]>
Date: 2009-01-11T18:00:26
Branch: net.venge.monotone
Modified files:
cmd_merging.cc
tests/noop_merge_into_workspace/__driver__.lua
ChangeLog:
Make merge_into_workspace complain instead of exploding when asked to merge in
an ancestor/descendant.
monotone --db={your.database} diff
--revision=821bdbb6e7dccef5f2565788534566306f400601
--revision=1a8afa25119c9c88dfd031c7fd834f6f99507ecf
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
