-----------------------------------------------------------------
Revision: a46bb47d1efda3bd9c05ae87cd1618743a6d1805
Ancestor: b16e3fc89ac2bc98cf6c3743e8090db81b733b1b
Ancestor: b706dbfb751237023ede1d8e57566f7293a4e2a0
Author: [email protected]
Date: 2009-08-29T14:19:21
Branch: net.venge.monotone
Added files:
tests/netsync_negotiation/__driver__.lua
tests/netsync_negotiation/netsync6.lua
tests/resolve_conflicts_all_resolutions/show_first-gui_left
tests/resolve_conflicts_all_resolutions/show_first-gui_right
tests/resolve_conflicts_all_resolutions/show_remaining-gui_left
tests/resolve_conflicts_duplicate_name_directory/__driver__.lua
Added directories:
tests/netsync_negotiation
tests/resolve_conflicts_duplicate_name_directory
Modified files:
NEWS cert.cc cert.hh cmd_conflicts.cc cmd_netsync.cc
constants.hh database.cc database.hh merge_conflict.cc
merge_roster.cc merge_roster.hh migrate_schema.cc
monotone.texi netcmd.cc netcmd.hh netsync.cc options.cc
options_list.hh project.cc project.hh
tests/resolve_conflicts_all_resolutions/__driver__.lua
tests/resolve_conflicts_all_resolutions/conflicts-1
tests/resolve_conflicts_all_resolutions/conflicts-resolved
tests/resolve_conflicts_all_resolutions/merge-1
tests/resolve_conflicts_all_resolutions/show_first-checkout_left
tests/resolve_conflicts_all_resolutions/show_first-checkout_right
tests/resolve_conflicts_all_resolutions/show_first-thermostat
tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
tests/resolve_conflicts_errors/__driver__.lua
unit-tests/netcmd.cc
ChangeLog:
merge of 'b16e3fc89ac2bc98cf6c3743e8090db81b733b1b'
and 'b706dbfb751237023ede1d8e57566f7293a4e2a0'
monotone --db={your.database} diff
--revision=b16e3fc89ac2bc98cf6c3743e8090db81b733b1b
--revision=a46bb47d1efda3bd9c05ae87cd1618743a6d1805
monotone --db={your.database} diff
--revision=b706dbfb751237023ede1d8e57566f7293a4e2a0
--revision=a46bb47d1efda3bd9c05ae87cd1618743a6d1805
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
