monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 704bf1f571ef68cb48fbf1f3dd2e651b446411


From: monotone
Subject: [Monotone-commits-diffs] Revision 704bf1f571ef68cb48fbf1f3dd2e651b44641119
Date: Thu, 8 Feb 2007 02:05:17 +0100

-----------------------------------------------------------------
Revision: 704bf1f571ef68cb48fbf1f3dd2e651b44641119
Ancestor: 074a8f62e125697fe6af0017781c80f9c4733649
Ancestor: 3105412040fc652d8469a130e165e8dc11db65cb
Author: address@hidden
Date: 2007-02-07T23:58:37
Branch: net.venge.monotone.workspace-merge.noconflict

Added files:
        tests/db_kill_rev_and_recommit/__driver__.lua
        tests/magic__MTN_in_restrictions/__driver__.lua
        tests/merge_into_workspace/__driver__.lua
        tests/merge_into_workspace/dont_merge
        tests/merge_into_workspace/left
        tests/merge_into_workspace/merged
        tests/merge_into_workspace/otherfile
        tests/merge_into_workspace/otherfile_mod
        tests/merge_into_workspace/right
        tests/merge_into_workspace/testfile
        tests/merge_into_workspace_attr_corpse/__driver__.lua
        tests/merge_into_workspace_attr_corpse/expected-roster
        tests/merge_into_workspace_attr_corpse/testfile
        tests/merge_into_workspace_files_added/__driver__.lua
        tests/merge_into_workspace_files_added/expected-revision
        tests/merge_into_workspace_files_added/left
        tests/merge_into_workspace_files_added/right
        tests/merge_into_workspace_files_added/testfile
        tests/merge_into_workspace_no_changes/__driver__.lua
        tests/merge_into_workspace_no_changes/left
        tests/merge_into_workspace_no_changes/right
        tests/merge_into_workspace_no_changes/testfile
        tests/merge_into_workspace_no_changes/unrelated
Added directories:
        tests/db_kill_rev_and_recommit
        tests/magic__MTN_in_restrictions tests/merge_into_workspace
        tests/merge_into_workspace_attr_corpse
        tests/merge_into_workspace_files_added
        tests/merge_into_workspace_no_changes
Modified files:
        ChangeLog automate.cc cert.cc cert.hh charset.cc cmd.hh
        cmd_merging.cc cmd_ws_commit.cc database.hh
        database_check.cc file_io.cc paths.cc paths.hh po/sv.po
        restrictions.cc restrictions.hh revision.cc revision.hh
        roster.cc roster.hh roster_merge.cc
        tests/_MTN_case-folding_security_patch/__driver__.lua
        tests/add_inside__MTN_/__driver__.lua
        tests/ls_unknown_in_subdir/__driver__.lua
        tests/restrictions_with_renames_and_adds/__driver__.lua
        tests/test_a_merge_8/__driver__.lua testsuite.lua work.cc
        work.hh

ChangeLog: 

explicit merge of '074a8f62e125697fe6af0017781c80f9c4733649'
              and '3105412040fc652d8469a130e165e8dc11db65cb'


monotone --db={your.database} diff 
--revision=074a8f62e125697fe6af0017781c80f9c4733649 
--revision=704bf1f571ef68cb48fbf1f3dd2e651b44641119
monotone --db={your.database} diff 
--revision=3105412040fc652d8469a130e165e8dc11db65cb 
--revision=704bf1f571ef68cb48fbf1f3dd2e651b44641119
----------------------------------------------------------------------




reply via email to

[Prev in Thread] Current Thread [Next in Thread]