On Sun, Feb 20, 2011 at 10:17 AM, Stefan Sperling <stsp_at_elego.de> wrote:
> The file isn't versioned yet. So it cannot be considered part of the
> 'mine' changeset. You should add the file so that Subversion knows
> it is supposed to consider it.
>
> However, if you add the file you will get a tree conflict when you update.
> And interactive conflict resolution doesn't handle tree conflicts yet.
> So the various --accept= options don't work for tree conflicts either.
> Interactive conflict resolution for tree conflicts should of course be
> added eventually but has been postponed until wc-ng is ready to handle
> tree conflicts better.
>
> The error message you're getting could be improved, of course.
> It should probably say 'Skipped foo', because we're usually skipping
> unversioned obstructions because we don't want to touch them in any way.
>
> Does svn status report the newly added file as obstructed after the update?
> I think it should.
I got around this problem by `svn add`ing each file and re-trying the
update until it finally succeeded.
Afterward, `svn status` reports:
? add_test-3.patch
? .git
? source-prop-encoding-5.1.patch
? .gitattributes
? source-prop-encoding_log_message-5.1.txt
? .gitignore
M subversion/tests/libsvn_subr/subst_translate-test.c
M subversion/tests/cmdline/svnrdump_tests.py
M subversion/tests/cmdline/svnsync_tests.py
? subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings2.expected.dump
? subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings2.dump
? subversion/tests/cmdline/svnsync_tests_data/.gitattributes
? subversion/tests/cmdline/svnsync_tests_data/copy-bad-encoding.dump
? subversion/tests/cmdline/svnsync_tests_data/copy-bad-encoding.expected.dump
? subversion/tests/cmdline/svnrdump_tests_data/copy-bad-line-endings2.dump
? subversion/tests/cmdline/svnrdump_tests_data/copy-bad-line-endings2.expected.dump
? subversion/tests/cmdline/svnrdump_tests_data/.gitattributes
M subversion/svnsync/sync.h
M subversion/svnsync/main.c
M subversion/svnsync/sync.c
M tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl
M packages/windows-WiX/BuildSubversion/WixDialog/build.bat
Received on 2011-02-20 20:42:19 CET