[Monotone-commits-diffs] Revision b697a522de7eba00c09ee3e0c5866066472e6add

[monotone]

-----------------------------------------------------------------
Revision: b697a522de7eba00c09ee3e0c5866066472e6add
Ancestor: ef39de24eccef9b22490d48964acbfadedfc133f
Ancestor: f0910ee164d7536ad8e04ee0d2786d13727ac060
Author: address@hidden
Date: 2007-09-08T10:56:21
Branch: net.venge.monotone.svn_import

Added files:
        contrib/diff3_keep_conflicts_merger.lua
        contrib/monotone-mail-notify-standalone.lua svn_import.cc
        svn_import.hh
        tests/importing_svn_one_revision/__driver__.lua
        tests/importing_svn_one_revision/makerepo.sh
        tests/importing_svn_one_revision/svn-repository.dump
        tests/importing_svn_one_revision_nodelta/__driver__.lua
        tests/importing_svn_one_revision_nodelta/makerepo.sh
        tests/importing_svn_one_revision_nodelta/svn-repository.dump
Added directories:
        tests/importing_svn_one_revision
        tests/importing_svn_one_revision_nodelta
Modified files:
        Makefile.am cmd_diff_log.cc cmd_merging.cc cmd_netsync.cc
        cmd_othervcs.cc cmd_ws_commit.cc contrib/README
        monotone.texi project.cc project.hh std_hooks.lua tester.cc
        tests/checkout_validates_target_directory/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/spawn_redirected_hook_helper/__driver__.lua
Modified attrs:
        tests/importing_svn_one_revision/makerepo.sh
        tests/importing_svn_one_revision_nodelta/makerepo.sh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
ef39de24eccef9b22490d48964acbfadedfc133f)
            to branch 'net.venge.monotone.svn_import' (head 
f0910ee164d7536ad8e04ee0d2786d13727ac060)


monotone --db={your.database} diff 
--revision=ef39de24eccef9b22490d48964acbfadedfc133f 
--revision=b697a522de7eba00c09ee3e0c5866066472e6add
monotone --db={your.database} diff 
--revision=f0910ee164d7536ad8e04ee0d2786d13727ac060 
--revision=b697a522de7eba00c09ee3e0c5866066472e6add
----------------------------------------------------------------------