[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone.issue-209: 2c0f9103d5356726f
|
From: |
code |
|
Subject: |
[Monotone-commits-diffs] net.venge.monotone.issue-209: 2c0f9103d5356726f5ff0abf8d3546cc5d22b144 |
|
Date: |
Sun, 10 Jun 2012 03:26:18 +0200 (CEST) |
revision: 2c0f9103d5356726f5ff0abf8d3546cc5d22b144
date: 2012-06-10T01:26:08
author: address@hidden
branch: net.venge.monotone.issue-209
changelog:
add pre-drop data to dropped_modified output.
* src/merge_conflict.cc:
* doc/monotone.texi: add pre-drop data to dropped_modified output
* src/merge_content.hh (content_merge_database_adaptor):
* src/merge_content.cc (content_merge_database_adaptor::get_dropped_details):
new
* test/func/resolve_conflicts_dropped_modified/__driver__.lua: test pre-dropped
details
* test/func/resolve_conflicts_dropped_modified/*: match changes.
manifest:
format_version "1"
new_manifest [45dc5174d2da8faf64d924f0d16f1e201ace7350]
old_revision [6c4dfef59abaf41783e202dc79fada774d2332a6]
patch "doc/monotone.texi"
from [9bb8f851cd652361bf4b4d0c0f645a7dd9659ccb]
to [0e142e05cc32b30995f845436ee7463dabdc279c]
patch "src/merge_conflict.cc"
from [71bce0c9082087835e6e7039391eaaeb0a03f3e7]
to [6fae4b5e0ab1c78bd6be557840d30f8c74d77be5]
patch "src/merge_content.cc"
from [7f032b0198b976f0c41399f104ae2bf4b974f845]
to [57645741618933e4443f1051f348fc140d861550]
patch "src/merge_content.hh"
from [1ba84d139770571a9f23c85de72388acceb6570c]
to [f9a3388e5d2bd6d873d352dabf896df32827e983]
patch "test/func/resolve_conflicts_dropped_modified/__driver__.lua"
from [d479660a7c57743e58e47eaa616cbd6cbdf91269]
to [650ff8bc711de52a04b983c0bdd734ca14311506]
patch "test/func/resolve_conflicts_dropped_modified/conflicts"
from [a175b596bc382b62b1646b03e9b8532cf2a19ac4]
to [c6a5d84c1e1345aef2a87ad2885fb6b9a03b70b9]
patch "test/func/resolve_conflicts_dropped_modified/conflicts-orphaned"
from [8fb06d4519659f162e902ee36fa0bd5346242435]
to [12fab989ba071fd2babef30ba3aad1744d4cb2fa]
patch "test/func/resolve_conflicts_dropped_modified/conflicts-orphaned-resolved"
from [a0f4f2e8e55ec599e3e3b810ffde282aac49196c]
to [672fd1e54221b5b6360759b9a9a41426ce36ed6d]
patch "test/func/resolve_conflicts_dropped_modified/conflicts-recreated"
from [84f2b46cd09c045eae6a8ad386f1337623db33a9]
to [26f633aeeee82440eea41f8e1747f2c4262ce9bb]
patch
"test/func/resolve_conflicts_dropped_modified/conflicts-recreated-resolved"
from [eda35ed4d0fd88adf5e07b52005d56aacd05bd8a]
to [5082532e55e68bc93610d1e8936fe790bb048d3d]
patch "test/func/resolve_conflicts_dropped_modified/conflicts-resolved"
from [249596c1618ef57e6d800845d0caebe31e748143]
to [dd892da237ef4f3a0ee30fa3989374a65d092d68]
patch "test/func/resolve_conflicts_dropped_modified/show_conflicts"
from [e2c170d1c80ad32ac17d6a881c69a692847ae056]
to [74f0f311dee5ce970396bed354b6ab0fd97077f0]
patch "test/func/resolve_conflicts_dropped_modified/show_conflicts-orphaned"
from [c72fc91818bad393cb71a003450a7ae8cc7a959f]
to [fbe2c5cc2c59c6fec1121e3be9469d370b9ed5cb]
============================================================
--- doc/monotone.texi 9bb8f851cd652361bf4b4d0c0f645a7dd9659ccb
+++ doc/monotone.texi 0e142e05cc32b30995f845436ee7463dabdc279c
@@ -10439,10 +10439,15 @@ @section Automation
ancestor_name "foo"
ancestor_file_id [e80910e54d0bdea1b6d295ada320b87aaf9fdc23]
left_type "dropped file"
+ left_rev [b0d6953684d49dd6bd345c312d6a0c8fed3078ce]
+ left_name "foo"
+ left_file_id [420cde699a422f7c3d2c8951c46ddfd546db66c0]
right_type "modified file"
right_name "baz"
right_file_id [fe6d523f607e2f2fc0f0defad3bda0351a95a337]
@end verbatim
+Here left_name, left_file_id are from left_rev, just before the file
+was dropped.
File orphaned and modified (and possibly renamed):
@verbatim
@@ -10450,6 +10455,9 @@ @section Automation
ancestor_name "foo"
ancestor_file_id [e80910e54d0bdea1b6d295ada320b87aaf9fdc23]
left_type "orphaned file"
+ left_rev [b0d6953684d49dd6bd345c312d6a0c8fed3078ce]
+ left_name "foo"
+ left_file_id [420cde699a422f7c3d2c8951c46ddfd546db66c0]
right_type "modified file"
right_name "baz"
right_file_id [fe6d523f607e2f2fc0f0defad3bda0351a95a337]
============================================================
--- src/merge_conflict.cc 71bce0c9082087835e6e7039391eaaeb0a03f3e7
+++ src/merge_conflict.cc 6fae4b5e0ab1c78bd6be557840d30f8c74d77be5
@@ -58,6 +58,7 @@ namespace
symbol const left_attr_value("left_attr_value");
symbol const left_file_id("left_file_id");
symbol const left_name("left_name");
+ symbol const left_rev("left_rev");
symbol const left_type("left_type");
symbol const missing_root("missing_root");
symbol const multiple_names("multiple_names");
@@ -78,6 +79,7 @@ namespace
symbol const right_attr_value("right_attr_value");
symbol const right_file_id("right_file_id");
symbol const right_name("right_name");
+ symbol const right_rev("right_rev");
symbol const right_type("right_type");
}
}
@@ -1062,6 +1064,25 @@ roster_merge_result::report_multiple_nam
}
}
+void static
+push_dropped_details(content_merge_database_adaptor & db_adaptor,
+ symbol rev_sym,
+ symbol name_sym,
+ symbol file_id_sym,
+ revision_id rev_id,
+ node_id nid,
+ basic_io::stanza & st)
+{
+ revision_id dropped_rev_id;
+ file_path dropped_name;
+ file_id dropped_file_id;
+ db_adaptor.get_dropped_details(rev_id, nid, dropped_rev_id, dropped_name, dropped_file_id);
+
+ st.push_binary_pair(rev_sym, dropped_rev_id.inner());
+ st.push_str_pair(name_sym, dropped_name.as_external());
+ st.push_binary_pair(file_id_sym, dropped_file_id.inner());
+}
+
void
roster_merge_result::report_dropped_modified_conflicts(roster_t const & left_roster,
roster_t const & right_roster,
@@ -1121,12 +1142,16 @@ roster_merge_result::report_dropped_modi
if (conflict.orphaned)
{
st.push_str_pair(syms::left_type, "orphaned file");
+ push_dropped_details(db_adaptor, syms::left_rev, syms::left_name, syms::left_file_id,
+ db_adaptor.left_rid, nid, st);
}
else
{
if (conflict.recreated == the_null_node)
{
st.push_str_pair(syms::left_type, "dropped file");
+ push_dropped_details(db_adaptor, syms::left_rev, syms::left_name, syms::left_file_id,
+ db_adaptor.left_rid, nid, st);
}
else
{
@@ -1150,12 +1175,16 @@ roster_merge_result::report_dropped_modi
if (conflict.orphaned)
{
st.push_str_pair(syms::right_type, "orphaned file");
+ push_dropped_details(db_adaptor, syms::right_rev, syms::right_name, syms::right_file_id,
+ db_adaptor.right_rid, nid, st);
}
else
{
if (conflict.recreated == the_null_node)
{
st.push_str_pair(syms::right_type, "dropped file");
+ push_dropped_details(db_adaptor, syms::right_rev, syms::right_name, syms::right_file_id,
+ db_adaptor.right_rid, nid, st);
}
else
{
@@ -1948,11 +1977,16 @@ read_dropped_modified_conflict(basic_io:
if (tmp == "dropped file")
{
- // no more data for left
+ pars.esym(syms::left_rev); pars.hex();
+ pars.esym(syms::left_name); pars.str();
+ pars.esym(syms::left_file_id); pars.hex();
}
else if (tmp == "orphaned file")
{
- // no more data for left
+ pars.esym(syms::left_rev); pars.hex();
+ pars.esym(syms::left_name); pars.str();
+ pars.esym(syms::left_file_id); pars.hex();
+
conflict.orphaned = true;
}
else if (tmp == "recreated file")
@@ -1975,11 +2009,16 @@ read_dropped_modified_conflict(basic_io:
if (tmp == "dropped file")
{
- // no more data for right
+ pars.esym(syms::right_rev); pars.hex();
+ pars.esym(syms::right_name); pars.str();
+ pars.esym(syms::right_file_id); pars.hex();
}
else if (tmp == "orphaned file")
{
- // no more data for right
+ pars.esym(syms::right_rev); pars.hex();
+ pars.esym(syms::right_name); pars.str();
+ pars.esym(syms::right_file_id); pars.hex();
+
conflict.orphaned = true;
}
else if (tmp == "recreated file")
============================================================
--- src/merge_content.cc 7f032b0198b976f0c41399f104ae2bf4b974f845
+++ src/merge_content.cc 57645741618933e4443f1051f348fc140d861550
@@ -180,6 +180,37 @@ void
}
void
+content_merge_database_adaptor::get_dropped_details(revision_id & rev_id,
+ node_id nid,
+ revision_id & dropped_rev_id,
+ file_path & dropped_name,
+ file_id & dropped_file_id)
+{
+ set<revision_id> parents;
+ db.get_revision_parents(rev_id, parents);
+
+ for (set<revision_id>::iterator i = parents.begin(); i != parents.end(); i++)
+ {
+ roster_t roster;
+ marking_map marking_map;
+
+ db.get_roster(*i, roster, marking_map);
+ if (roster.has_node(nid))
+ {
+ dropped_rev_id = *i;
+ roster.get_file_details(nid, dropped_file_id, dropped_name);
+ return;
+ }
+ else
+ {
+ set<revision_id> more_parents;
+ db.get_revision_parents(*i, more_parents);
+ parents.insert(more_parents.begin(), more_parents.end());
+ }
+ }
+}
+
+void
content_merge_database_adaptor::get_version(file_id const & ident,
file_data & dat) const
{
============================================================
--- src/merge_content.hh 1ba84d139770571a9f23c85de72388acceb6570c
+++ src/merge_content.hh f9a3388e5d2bd6d873d352dabf896df32827e983
@@ -88,6 +88,14 @@ content_merge_database_adaptor
revision_id & rid,
boost::shared_ptr<roster_t const> & anc);
+ // Search parents of rev_id (which must be left_rid or right_rid); return
+ // rev, file_path, and file_id for nid just before it was dropped.
+ void get_dropped_details(revision_id & rev_id,
+ node_id nid,
+ revision_id & dropped_rev_id,
+ file_path & dropped_name,
+ file_id & dropped_file_id);
+
void get_version(file_id const & ident,
file_data & dat) const;
};
============================================================
--- test/func/resolve_conflicts_dropped_modified/__driver__.lua d479660a7c57743e58e47eaa616cbd6cbdf91269
+++ test/func/resolve_conflicts_dropped_modified/__driver__.lua 650ff8bc711de52a04b983c0bdd734ca14311506
@@ -16,8 +16,8 @@ addfile("file_3", "file_3 base") -- drop
addfile("file_2", "file_2 base") -- modify/rename left, drop right; drop
addfile("file_3", "file_3 base") -- drop left, modify/rename right; drop
-addfile("file_4", "file_4 base") -- modify left, drop right; keep
-addfile("file_5", "file_5 base") -- drop left, modify right; keep
+addfile("file_4", "file_4 base") -- modify left; modify, rename, and drop right; keep
+addfile("file_5", "file_5 base") -- modify, rename, and drop left; modify right; keep
addfile("file_6", "file_6 base") -- modify/rename left, drop right; user
addfile("file_7", "file_7 base") -- drop left, modify/rename right; user
commit("testbranch", "base")
@@ -30,14 +30,18 @@ writefile("file_4", "file_4 left")
writefile("file_4", "file_4 left")
-check(mtn("drop", "file_5"), 0, false, false)
+writefile("file_5", "file_5 left")
+check(mtn("mv", "file_5", "file_5_renamed"), 0, false, false)
writefile("file_6", "file_6 left")
check(mtn("mv", "file_6", "file_6_renamed"), 0, false, false)
check(mtn("drop", "file_7"), 0, false, false)
-commit("testbranch", "left 1")
+commit("testbranch", "left 1a")
+
+check(mtn("drop", "file_5_renamed"), 0, nil, true)
+commit("testbranch", "left 1b")
left_1 = base_revision()
revert_to(base)
@@ -47,7 +51,8 @@ check(mtn("mv", "file_3", "file_3_rename
writefile("file_3", "file_3 right")
check(mtn("mv", "file_3", "file_3_renamed"), 0, false, false)
-check(mtn("drop", "file_4"), 0, false, false)
+writefile("file_4", "file_4 right")
+check(mtn("mv", "file_4", "file_4_renamed"), 0, false, false)
writefile("file_5", "file_5 right")
@@ -56,7 +61,10 @@ check(mtn("mv", "file_7", "file_7_rename
writefile("file_7", "file_7 right")
check(mtn("mv", "file_7", "file_7_renamed"), 0, false, false)
-commit("testbranch", "right 1")
+commit("testbranch", "right 1a")
+
+check(mtn("drop", "file_4_renamed"), 0, false, false)
+commit("testbranch", "right 1b")
right_1 = base_revision()
-- Now start the conflict resolution process. First show the conflicts.
@@ -260,12 +268,12 @@ check(samelines("stderr",
check(mtn("explicit_merge", "--resolve-conflicts", left_3, right_3, "testbranch"), 0, nil, true)
check(samelines("stderr",
-{"mtn: [left] e6dba3377cbb926ae4e90642714daef18802b2ff",
- "mtn: [right] 9549ab0f562b7a6d4597daa274892a922f38d45a",
+{"mtn: [left] 4228fbd8003cdd89e7eea51fcef10c3f91d78f69",
+ "mtn: [right] 6cb6438a490a1ad4c69ff6cac23c75a903cd9cfd",
"mtn: replacing content of 'dir2/file_10' (renamed to 'file_10') with '_MTN/resolutions/file_10'",
"mtn: dropping 'dir2/file_11'",
"mtn: renaming 'dir2/file_9' to 'file_9'",
- "mtn: [merged] 435d4d0197ba785b0360961debe3080f5704313e"}))
+ "mtn: [merged] 5cafe5405ed31c81f9061be62e38f25aeaaea9c5"}))
-- A special case; drop then re-add vs modify. This used to be the test
-- "merge((patch_a),_(drop_a,_add_a))"
@@ -295,13 +303,13 @@ check(samelines("stderr",
check(mtn("show_conflicts", left_4, right_4), 0, nil, true)
check(samelines("stderr",
-{"mtn: [left] fd12d8fb1973814d7756bae60c668b9c82364b59",
- "mtn: [right] 74ded9748ae7ee457a83a8d8a7dd0ffac93b13af",
- "mtn: [ancestor] 613d77ec3ea9e0cda71d1a9c8328d4965b5730bf",
- "mtn: conflict: file 'file_10' from revision 613d77ec3ea9e0cda71d1a9c8328d4965b5730bf",
+{"mtn: [left] 9485fe891d5e23d6dc30140228cd02840ee719e9",
+ "mtn: [right] 9a8192d3bf263cbd5782791e823b837d42af6902",
+ "mtn: [ancestor] 209e4118bda3960b2f83e48b2368e981ab748ee5",
+ "mtn: conflict: file 'file_10' from revision 209e4118bda3960b2f83e48b2368e981ab748ee5",
"mtn: modified on the left, named file_10",
"mtn: dropped and recreated on the right",
- "mtn: conflict: file 'file_11' from revision 613d77ec3ea9e0cda71d1a9c8328d4965b5730bf",
+ "mtn: conflict: file 'file_11' from revision 209e4118bda3960b2f83e48b2368e981ab748ee5",
"mtn: dropped and recreated on the left",
"mtn: modified on the right, named file_11",
"mtn: 2 conflicts with supported resolutions."}))
@@ -342,11 +350,11 @@ check(samelines("stderr",
check(mtn("explicit_merge", "--resolve-conflicts", left_4, right_4, "testbranch"), 0, nil, true)
check(samelines("stderr",
-{"mtn: [left] fd12d8fb1973814d7756bae60c668b9c82364b59",
- "mtn: [right] 74ded9748ae7ee457a83a8d8a7dd0ffac93b13af",
+{"mtn: [left] 9485fe891d5e23d6dc30140228cd02840ee719e9",
+ "mtn: [right] 9a8192d3bf263cbd5782791e823b837d42af6902",
"mtn: keeping 'file_10' from left",
"mtn: replacing content of 'file_11' with '_MTN/resolutions/file_11'",
- "mtn: [merged] 146a0f04f7f1d015976a10ab6a0c7164f0789ac7"}))
+ "mtn: [merged] 306eb31064512a8a2f4d316ff7a7ec32a1f64f4c"}))
check(mtn("update"), 0, nil, true)
check(samelines("file_10", {"file_10 left"}))
============================================================
--- test/func/resolve_conflicts_dropped_modified/conflicts a175b596bc382b62b1646b03e9b8532cf2a19ac4
+++ test/func/resolve_conflicts_dropped_modified/conflicts c6a5d84c1e1345aef2a87ad2885fb6b9a03b70b9
@@ -1,5 +1,5 @@
- left [f675f3440ebd978fffba5d990e8c876ae9470aa3]
- right [3b44e67a00d6f2ef92279d5fd07b46cc175b3291]
+ left [7b2ef4343b0717bcd122498a1a0b7ff7acffb64c]
+ right [ca7922b510f9daf5c4b28c6788315ee82eb9a7f0]
ancestor [c2fe3623ce72d248154425dc7db2ddcc397c9aca]
conflict dropped_modified
@@ -9,11 +9,17 @@ ancestor_file_id [4fd0fa24812427ee6c13a8
left_name "file_2_renamed"
left_file_id [afbd804a8c606a93f9d8bc0fdacc1db9f34b4548]
right_type "dropped file"
+ right_rev [c2fe3623ce72d248154425dc7db2ddcc397c9aca]
+ right_name "file_2"
+ right_file_id [4fd0fa24812427ee6c13a839d2a90bc0c6fc0091]
conflict dropped_modified
ancestor_name "file_3"
ancestor_file_id [311aac8e6f1fb6fca84da5153aa6d5a1c6faff79]
left_type "dropped file"
+ left_rev [c2fe3623ce72d248154425dc7db2ddcc397c9aca]
+ left_name "file_3"
+ left_file_id [311aac8e6f1fb6fca84da5153aa6d5a1c6faff79]
right_type "modified file"
right_name "file_3_renamed"
right_file_id [da7ea65160c9c92f4ed120568229342fe7daa924]
@@ -25,11 +31,17 @@ ancestor_file_id [861174e6639f2991d9c065
left_name "file_4"
left_file_id [57f26e8057760f356762c405bdc1f89b0a9bfed2]
right_type "dropped file"
+ right_rev [4125c3aea991e97a3063c3e3f425a47d58e7c8da]
+ right_name "file_4_renamed"
+ right_file_id [259dbd8291bd18ba3fdb9adb3776eb26f94b1230]
conflict dropped_modified
ancestor_name "file_5"
ancestor_file_id [d141bda733292622ebce4c231cbb0da44ac59f40]
left_type "dropped file"
+ left_rev [b0d6953684d49dd6bd345c312d6a0c8fed3078ce]
+ left_name "file_5_renamed"
+ left_file_id [420cde699a422f7c3d2c8951c46ddfd546db66c0]
right_type "modified file"
right_name "file_5"
right_file_id [e7eb31ab48c2e42126f44ef78ffdb27f388333b0]
@@ -41,11 +53,17 @@ ancestor_file_id [d5531643d3b5aee3e10ece
left_name "file_6_renamed"
left_file_id [1f62c734b799474943bfdda12b062f61024dc059]
right_type "dropped file"
+ right_rev [c2fe3623ce72d248154425dc7db2ddcc397c9aca]
+ right_name "file_6"
+ right_file_id [d5531643d3b5aee3e10eceabbdfecf167148a2d9]
conflict dropped_modified
ancestor_name "file_7"
ancestor_file_id [1a9d3059360fd5f04d0cec05875c8e376da0eaef]
left_type "dropped file"
+ left_rev [c2fe3623ce72d248154425dc7db2ddcc397c9aca]
+ left_name "file_7"
+ left_file_id [1a9d3059360fd5f04d0cec05875c8e376da0eaef]
right_type "modified file"
right_name "file_7_renamed"
right_file_id [9b362e2754ea1f943497d5a31de3899271ee5a8b]
============================================================
--- test/func/resolve_conflicts_dropped_modified/conflicts-orphaned 8fb06d4519659f162e902ee36fa0bd5346242435
+++ test/func/resolve_conflicts_dropped_modified/conflicts-orphaned 12fab989ba071fd2babef30ba3aad1744d4cb2fa
@@ -1,6 +1,6 @@
- left [e6dba3377cbb926ae4e90642714daef18802b2ff]
- right [9549ab0f562b7a6d4597daa274892a922f38d45a]
-ancestor [c55331b815b944b2fcde9b2ce42536dbda706a4c]
+ left [4228fbd8003cdd89e7eea51fcef10c3f91d78f69]
+ right [6cb6438a490a1ad4c69ff6cac23c75a903cd9cfd]
+ancestor [44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1]
conflict dropped_modified
ancestor_name "dir2/file_10"
@@ -9,6 +9,9 @@ ancestor_file_id [7368a4340573dca149c05d
left_name "dir2/file_10"
left_file_id [080c590e6e671b1b9ca0e752e1bc468c5167e2a9]
right_type "orphaned file"
+ right_rev [44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1]
+ right_name "dir2/file_10"
+ right_file_id [7368a4340573dca149c05db6f49638fafee766d0]
conflict dropped_modified
ancestor_name "dir2/file_11"
@@ -17,6 +20,9 @@ ancestor_file_id [498b49fddbd0418f62eb19
left_name "dir2/file_11"
left_file_id [ea74c930ce75ac43380f520f9cdd4e85f56ed049]
right_type "orphaned file"
+ right_rev [44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1]
+ right_name "dir2/file_11"
+ right_file_id [498b49fddbd0418f62eb19d2096de816f3e34116]
conflict dropped_modified
ancestor_name "dir2/file_9"
@@ -25,3 +31,6 @@ ancestor_file_id [6259d1132e063364597e6e
left_name "dir2/file_9"
left_file_id [d1c21ac76fd433b5f1daead0438938b45f9e13a8]
right_type "orphaned file"
+ right_rev [44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1]
+ right_name "dir2/file_9"
+ right_file_id [6259d1132e063364597e6ee84a431b432f0e9cf9]
============================================================
--- test/func/resolve_conflicts_dropped_modified/conflicts-orphaned-resolved a0f4f2e8e55ec599e3e3b810ffde282aac49196c
+++ test/func/resolve_conflicts_dropped_modified/conflicts-orphaned-resolved 672fd1e54221b5b6360759b9a9a41426ce36ed6d
@@ -1,6 +1,6 @@
- left [e6dba3377cbb926ae4e90642714daef18802b2ff]
- right [9549ab0f562b7a6d4597daa274892a922f38d45a]
-ancestor [c55331b815b944b2fcde9b2ce42536dbda706a4c]
+ left [4228fbd8003cdd89e7eea51fcef10c3f91d78f69]
+ right [6cb6438a490a1ad4c69ff6cac23c75a903cd9cfd]
+ancestor [44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1]
conflict dropped_modified
ancestor_name "dir2/file_10"
@@ -9,6 +9,9 @@ ancestor [c55331b815b944b2fcde9b2ce42536
left_name "dir2/file_10"
left_file_id [080c590e6e671b1b9ca0e752e1bc468c5167e2a9]
right_type "orphaned file"
+ right_rev [44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1]
+ right_name "dir2/file_10"
+ right_file_id [7368a4340573dca149c05db6f49638fafee766d0]
resolved_user_left "_MTN/resolutions/file_10"
resolved_rename_left "file_10"
@@ -19,6 +22,9 @@ resolved_rename_left "file_10"
left_name "dir2/file_11"
left_file_id [ea74c930ce75ac43380f520f9cdd4e85f56ed049]
right_type "orphaned file"
+ right_rev [44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1]
+ right_name "dir2/file_11"
+ right_file_id [498b49fddbd0418f62eb19d2096de816f3e34116]
resolved_drop_left
conflict dropped_modified
@@ -28,4 +34,7 @@ resolved_drop_left
left_name "dir2/file_9"
left_file_id [d1c21ac76fd433b5f1daead0438938b45f9e13a8]
right_type "orphaned file"
+ right_rev [44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1]
+ right_name "dir2/file_9"
+ right_file_id [6259d1132e063364597e6ee84a431b432f0e9cf9]
resolved_rename_left "file_9"
============================================================
--- test/func/resolve_conflicts_dropped_modified/conflicts-recreated 84f2b46cd09c045eae6a8ad386f1337623db33a9
+++ test/func/resolve_conflicts_dropped_modified/conflicts-recreated 26f633aeeee82440eea41f8e1747f2c4262ce9bb
@@ -1,6 +1,6 @@
- left [fd12d8fb1973814d7756bae60c668b9c82364b59]
- right [74ded9748ae7ee457a83a8d8a7dd0ffac93b13af]
-ancestor [613d77ec3ea9e0cda71d1a9c8328d4965b5730bf]
+ left [9485fe891d5e23d6dc30140228cd02840ee719e9]
+ right [9a8192d3bf263cbd5782791e823b837d42af6902]
+ancestor [209e4118bda3960b2f83e48b2368e981ab748ee5]
conflict dropped_modified
ancestor_name "file_10"
============================================================
--- test/func/resolve_conflicts_dropped_modified/conflicts-recreated-resolved eda35ed4d0fd88adf5e07b52005d56aacd05bd8a
+++ test/func/resolve_conflicts_dropped_modified/conflicts-recreated-resolved 5082532e55e68bc93610d1e8936fe790bb048d3d
@@ -1,6 +1,6 @@
- left [fd12d8fb1973814d7756bae60c668b9c82364b59]
- right [74ded9748ae7ee457a83a8d8a7dd0ffac93b13af]
-ancestor [613d77ec3ea9e0cda71d1a9c8328d4965b5730bf]
+ left [9485fe891d5e23d6dc30140228cd02840ee719e9]
+ right [9a8192d3bf263cbd5782791e823b837d42af6902]
+ancestor [209e4118bda3960b2f83e48b2368e981ab748ee5]
conflict dropped_modified
ancestor_name "file_10"
============================================================
--- test/func/resolve_conflicts_dropped_modified/conflicts-resolved 249596c1618ef57e6d800845d0caebe31e748143
+++ test/func/resolve_conflicts_dropped_modified/conflicts-resolved dd892da237ef4f3a0ee30fa3989374a65d092d68
@@ -1,5 +1,5 @@
- left [f675f3440ebd978fffba5d990e8c876ae9470aa3]
- right [3b44e67a00d6f2ef92279d5fd07b46cc175b3291]
+ left [7b2ef4343b0717bcd122498a1a0b7ff7acffb64c]
+ right [ca7922b510f9daf5c4b28c6788315ee82eb9a7f0]
ancestor [c2fe3623ce72d248154425dc7db2ddcc397c9aca]
conflict dropped_modified
@@ -9,12 +9,18 @@ ancestor [c2fe3623ce72d248154425dc7db2dd
left_name "file_2_renamed"
left_file_id [afbd804a8c606a93f9d8bc0fdacc1db9f34b4548]
right_type "dropped file"
+ right_rev [c2fe3623ce72d248154425dc7db2ddcc397c9aca]
+ right_name "file_2"
+ right_file_id [4fd0fa24812427ee6c13a839d2a90bc0c6fc0091]
resolved_drop_left
conflict dropped_modified
ancestor_name "file_3"
ancestor_file_id [311aac8e6f1fb6fca84da5153aa6d5a1c6faff79]
left_type "dropped file"
+ left_rev [c2fe3623ce72d248154425dc7db2ddcc397c9aca]
+ left_name "file_3"
+ left_file_id [311aac8e6f1fb6fca84da5153aa6d5a1c6faff79]
right_type "modified file"
right_name "file_3_renamed"
right_file_id [da7ea65160c9c92f4ed120568229342fe7daa924]
@@ -27,12 +33,18 @@ resolved_drop_left
left_name "file_4"
left_file_id [57f26e8057760f356762c405bdc1f89b0a9bfed2]
right_type "dropped file"
+ right_rev [4125c3aea991e97a3063c3e3f425a47d58e7c8da]
+ right_name "file_4_renamed"
+ right_file_id [259dbd8291bd18ba3fdb9adb3776eb26f94b1230]
resolved_keep_left
conflict dropped_modified
ancestor_name "file_5"
ancestor_file_id [d141bda733292622ebce4c231cbb0da44ac59f40]
left_type "dropped file"
+ left_rev [b0d6953684d49dd6bd345c312d6a0c8fed3078ce]
+ left_name "file_5_renamed"
+ left_file_id [420cde699a422f7c3d2c8951c46ddfd546db66c0]
right_type "modified file"
right_name "file_5"
right_file_id [e7eb31ab48c2e42126f44ef78ffdb27f388333b0]
@@ -45,12 +57,18 @@ resolved_keep_left
left_name "file_6_renamed"
left_file_id [1f62c734b799474943bfdda12b062f61024dc059]
right_type "dropped file"
+ right_rev [c2fe3623ce72d248154425dc7db2ddcc397c9aca]
+ right_name "file_6"
+ right_file_id [d5531643d3b5aee3e10eceabbdfecf167148a2d9]
resolved_user_left "_MTN/resolutions/file_6_resolved"
conflict dropped_modified
ancestor_name "file_7"
ancestor_file_id [1a9d3059360fd5f04d0cec05875c8e376da0eaef]
left_type "dropped file"
+ left_rev [c2fe3623ce72d248154425dc7db2ddcc397c9aca]
+ left_name "file_7"
+ left_file_id [1a9d3059360fd5f04d0cec05875c8e376da0eaef]
right_type "modified file"
right_name "file_7_renamed"
right_file_id [9b362e2754ea1f943497d5a31de3899271ee5a8b]
============================================================
--- test/func/resolve_conflicts_dropped_modified/show_conflicts e2c170d1c80ad32ac17d6a881c69a692847ae056
+++ test/func/resolve_conflicts_dropped_modified/show_conflicts 74f0f311dee5ce970396bed354b6ab0fd97077f0
@@ -1,5 +1,5 @@
-mtn: [left] f675f3440ebd978fffba5d990e8c876ae9470aa3
-mtn: [right] 3b44e67a00d6f2ef92279d5fd07b46cc175b3291
+mtn: [left] 7b2ef4343b0717bcd122498a1a0b7ff7acffb64c
+mtn: [right] ca7922b510f9daf5c4b28c6788315ee82eb9a7f0
mtn: [ancestor] c2fe3623ce72d248154425dc7db2ddcc397c9aca
mtn: conflict: file 'file_2' from revision c2fe3623ce72d248154425dc7db2ddcc397c9aca
mtn: modified on the left, named file_2_renamed
============================================================
--- test/func/resolve_conflicts_dropped_modified/show_conflicts-orphaned c72fc91818bad393cb71a003450a7ae8cc7a959f
+++ test/func/resolve_conflicts_dropped_modified/show_conflicts-orphaned fbe2c5cc2c59c6fec1121e3be9469d370b9ed5cb
@@ -1,13 +1,13 @@
-mtn: [left] e6dba3377cbb926ae4e90642714daef18802b2ff
-mtn: [right] 9549ab0f562b7a6d4597daa274892a922f38d45a
-mtn: [ancestor] c55331b815b944b2fcde9b2ce42536dbda706a4c
-mtn: conflict: file 'dir2/file_10' from revision c55331b815b944b2fcde9b2ce42536dbda706a4c
+mtn: [left] 4228fbd8003cdd89e7eea51fcef10c3f91d78f69
+mtn: [right] 6cb6438a490a1ad4c69ff6cac23c75a903cd9cfd
+mtn: [ancestor] 44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1
+mtn: conflict: file 'dir2/file_10' from revision 44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1
mtn: modified on the left, named dir2/file_10
mtn: orphaned on the right
-mtn: conflict: file 'dir2/file_11' from revision c55331b815b944b2fcde9b2ce42536dbda706a4c
+mtn: conflict: file 'dir2/file_11' from revision 44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1
mtn: modified on the left, named dir2/file_11
mtn: orphaned on the right
-mtn: conflict: file 'dir2/file_9' from revision c55331b815b944b2fcde9b2ce42536dbda706a4c
+mtn: conflict: file 'dir2/file_9' from revision 44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1
mtn: modified on the left, named dir2/file_9
mtn: orphaned on the right
mtn: 3 conflicts with supported resolutions.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone.issue-209: 2c0f9103d5356726f5ff0abf8d3546cc5d22b144,
code <=