[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: 1.6 blocker? copy operation during update fails

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 07 Jan 2009 13:28:50 +0000

Julian Foad wrote:
> I'll be looking at this, of course. It looks like a tree-conflict bug.

Debugging...
subversion/libsvn_wc/merge.c:648 in svn_wc__merge_internal():

[[[
          /* Back up MERGE_TARGET through detranslation/retranslation:
             the new translation properties may not match the current ones */
          SVN_ERR(svn_wc_translated_file2(&tmp_target_copy,
                                          merge_target,
                                          merge_target,
                                          adm_access,
                                          SVN_WC_TRANSLATE_TO_NF
                                          | SVN_WC_TRANSLATE_NO_OUTPUT_CLEANUP,
                                          pool));
          SVN_ERR(svn_wc__loggy_translated_file
                  (log_accum, adm_access,
                   target_copy, tmp_target_copy, merge_target, pool));
]]]

Somewhere about here, the code writes a log instruction to
copy-and-translate the file "alpha.moved" which does not exist.

Just before executing this code,
merge_target = "recipe-i3354/trunk2/alpha.moved"

Tracking down the introduction of the bug by a binary chop...
it's r34158:
  "Fix update/switch to skip all tree conflict victims and their
  descendants. Skip both newly-discovered and existing tree conflicts."

This change doesn't touch that file "merge.c".

That's where I've got to so far.

- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1009930
Received on 2009-01-07 14:29:35 CET

This is an archived mail posted to the Subversion Dev mailing list.