[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 9e0bef3036c2fa59130557baa372186462ed4e
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 9e0bef3036c2fa59130557baa372186462ed4e9c |
Date: |
Mon, 4 Feb 2008 15:07:43 +0100 |
-----------------------------------------------------------------
Revision: 9e0bef3036c2fa59130557baa372186462ed4e9c
Ancestor: 9bfdd83e400bbc9a321c5809a9c0f5b301cce3f2
Ancestor: d3b183e9da3a652f1552ac5b916ddc1d5806a08c
Author: Timothy Brownawell <address@hidden>
Date: 2008-02-04T13:36:30
Branch: net.venge.monotone.tbrownaw.policy-branches
Added files:
cmd_policy.cc tests/imp_test_filesync_confdir/__driver__.lua
tests/merge_update_part_of_file/__driver__.lua
tests/merge_update_part_of_file/after.diff
tests/merge_update_part_of_file/before.diff
tests/merge_update_part_of_file/onechange
tests/merge_update_part_of_file/original
tests/merge_update_part_of_file/twochanges
tests/update_with_pending_modification/__driver__.lua
Added directories:
tests/imp_test_filesync_confdir
tests/merge_update_part_of_file
tests/update_with_pending_modification
Modified files:
Makefile.am annotate.cc annotate.hh app_state.cc
app_state.hh automate.cc cert.cc cert.hh cmd.hh cmd_db.cc
cmd_diff_log.cc cmd_files.cc cmd_key_cert.cc cmd_list.cc
cmd_merging.cc cmd_netsync.cc cmd_othervcs.cc
cmd_ws_commit.cc commands.cc database.cc database.hh
enumerator.cc enumerator.hh epoch.cc epoch.hh lua_hooks.cc
lua_hooks.hh luaext_platform.cc netcmd.hh netsync.cc
project.cc project.hh rcs_import.cc revision.cc selectors.cc
std_hooks.lua tester.cc tests/test_hooks.lua vocab_terms.hh
ChangeLog:
propagate from branch 'net.venge.monotone.experiment.encapsulation' (head
9bfdd83e400bbc9a321c5809a9c0f5b301cce3f2)
to branch 'net.venge.monotone.tbrownaw.policy-branches' (head
d3b183e9da3a652f1552ac5b916ddc1d5806a08c)
monotone --db={your.database} diff
--revision=9bfdd83e400bbc9a321c5809a9c0f5b301cce3f2
--revision=9e0bef3036c2fa59130557baa372186462ed4e9c
monotone --db={your.database} diff
--revision=d3b183e9da3a652f1552ac5b916ddc1d5806a08c
--revision=9e0bef3036c2fa59130557baa372186462ed4e9c
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 9e0bef3036c2fa59130557baa372186462ed4e9c,
monotone <=