From d98316ef0ca8d3a05685a6d0661e9127f4711b86 Mon Sep 17 00:00:00 2001 From: mhagger Date: Mon, 4 Apr 2011 12:08:03 +0000 Subject: [PATCH] Expound on the handling of NTDBR parents. git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5336 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- cvs2svn_lib/symbol_statistics.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cvs2svn_lib/symbol_statistics.py b/cvs2svn_lib/symbol_statistics.py index 352f7b48..f6ca28a6 100644 --- a/cvs2svn_lib/symbol_statistics.py +++ b/cvs2svn_lib/symbol_statistics.py @@ -141,10 +141,18 @@ class _Stats: # revision where the branch is rooted: register(parent_cvs_rev.lod) + # If the parent revision is a non-trunk default (vendor) branch + # revision, then count trunk as a possible parent. In particular, + # the symbol could be grafted to the post-commit that copies the + # vendor branch changes to trunk. On the other hand, our vendor + # branch handling is currently too stupid to do so. On the other + # other hand, when the vendor branch is being excluded from the + # conversion, then the vendor branch revision will be moved to + # trunk, again making trunk a possible parent--and *this* our code + # can handle. In the end, considering trunk a possible parent can + # never affect the correctness of the conversion, and on balance + # seems to improve the selection of symbol parents. if parent_cvs_rev.ntdbr: - # If the parent revision is a vendor branch revision, and it - # existed when the vendor branch was the default branch, then - # trunk is a possible parent. register(cvs_file_items.trunk) # Any other branches that are rooted at the same revision and -- 2.11.4.GIT