#132: Monotone -> Svn drops changes while remove or delete other files
---------------------+------------------------------------------------------
Reporter: HenryN | Owner: lele
Type: defect | Status: new
Priority: major | Milestone:
Component: mtn | Version: 0.9
Resolution: | Keywords:
---------------------+------------------------------------------------------
Comment (by HenryN):
Replying to [ticket:132 HenryN]:
Fixed by follow patch:
{{{
File: monotone-rename-drops-changes.patch
Monotone: Changes on file was missing, if other will be renamed or
removed.
Check with 'test-mtn-svn-rename-change.sh'.
'test-mtn-svn-back-del-ren-add-change.sh' is a more complexe test.
============================================================
--- tailor-0.9.28/vcpx/repository/monotone.py
+++ tailor-0.9.28/vcpx/repository/monotone.py
@@ -555,6 +565,22 @@
"followed by '%s','%s','%s'" % (fromw,
oldr,
tow,
newr))
+ # The 'chentry' is not nessesary if no other
entries exist.
+ # But needs, if one entry with rename or delete
exist before,
+ # because the list of modifired file will be
upstream only
+ # files from this list (Monotone to Subversion).
+ # So, the best: Always list the changed files
here.
+ #
+ # Add file to the list, if no rename or other
entry exist.
+ flag = True
+ for i,e in enumerate(chset.entries):
+ if e.name == fname[1:-1]:
+ flag = False
+ break
+ if flag:
+ chentry = chset.addEntry(fname[1:-1],
chset.revision)
+ chentry.action_kind = chentry.UPDATED
+
except StopIteration:
if in_item:
raise GetUpstreamChangesetsFailure("Unexpected end of
'diff' parsing changeset info")
}}}
The patch can download also from
http://www.henrynestler.com/tailor/monotone-rename-drops-changes.patch
A testing script (test-mtn-svn-rename-change.sh), my full patch (monotone-
complete-20070602.patch) and more can cownload from
http://www.henrynestler.com/tailor/
Henry N.
--
Ticket URL: <http://progetti.arstecnica.it/tailor/ticket/132#comment:2>
Tailor <http://progetti.arstecnica.it/tailor>
An inter-VCs changeset exchanger_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
