[Monotone-commits-diffs] net.venge.monotone: 6d854164c71f5b5b1e8c635a0fedb494f0ee05f6

[code]

revision:            6d854164c71f5b5b1e8c635a0fedb494f0ee05f6
date:                2011-01-10T22:53:49
author:              address@hidden
branch:              net.venge.monotone
changelog:
 * cmd_ws_commit.cc (perform_commit): it doesn't matter if an added or patched 
file changed its contents during commit, it should always be tagged as 
origin::user

manifest:
format_version "1"

new_manifest [4701aa304449dcfadf466996d099413096a86a05]

old_revision [3903ea47e7b1a656e0695f10d57bc0e9deca205b]

patch "cmd_ws_commit.cc"
 from [f57a10a256f5b367247a38fc1e86f8eee66a7b84]
   to [7b91a53d8eec4e78b062092f85c945bbaaefe23a]
============================================================
--- cmd_ws_commit.cc	f57a10a256f5b367247a38fc1e86f8eee66a7b84
+++ cmd_ws_commit.cc	7b91a53d8eec4e78b062092f85c945bbaaefe23a
@@ -1691,7 +1691,7 @@ void perform_commit(app_state & app,
                     // sanity check
                     file_id tid;
                     calculate_ident(file_data(new_data), tid);
-                    E(tid == new_content, origin::system,
+                    E(tid == new_content, origin::user,
                       F("file '%s' modified during commit, aborting")
                       % path);
                     delta del;