Using svn 1.5.0 to merge branches/1.5.x-issue3067 into a clean WC of
branches/1.5.x, I am seeing strange notifications.
1. "Skipped missing target: 'subversion/libsvn_auth_kwallet'" messages
for many such targets that don't exist in either of these branches.
2. "A" ("Add") notifications for files that are already present and are
not being added by the merge.
3. "Conflict for property 'svn:ignore' discovered on
'subversion/tests/libsvn_subr'" but when I choose (e) to edit the file,
I get a file containing some 'svn:ignore' value but without any conflict
markers in it. (I wouldn't be surprised if that's a known deficiency,
but I wasn't aware of it and it's not clear how I'm supposed to be able
to resolve the conflict in the editor.)
Transcript:
> julianfoad_at_edith ~/src/subversion-1.5.x
> $ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-issue3067
> G CHANGES
> G COMMITTERS
> G subversion/bindings/swig/python/tests/trac/test.py
> G subversion/bindings/swig
> Skipped missing target: 'subversion/libsvn_auth_kwallet'
> Skipped missing target: 'subversion/libsvn_auth_gnome_keyring'
> Skipped missing target: 'subversion/include/private/svn_utf_private.h'
> Skipped missing target: 'subversion/include/svn_cache.h'
> Skipped missing target: 'subversion/include/private/svn_auth_private.h'
> Skipped missing target: 'subversion/include/svn_auth_dso.h'
> Skipped missing target: 'subversion/include/private/svn_opt_private.h'
> Skipped missing target: 'subversion/include/private/svn_log.h'
> Skipped missing target: 'subversion/include/private/svn_cmdline_private.h'
> Skipped missing target: 'subversion/libsvn_subr/cache.h'
> Skipped missing target: 'subversion/libsvn_subr/log.c'
> Skipped missing target: 'subversion/libsvn_subr/cache.c'
> Skipped missing target: 'subversion/libsvn_subr/cache-memcache.c'
> Skipped missing target: 'subversion/libsvn_subr/cache-inprocess.c'
> Skipped missing target: 'subversion/libsvn_client/cmdline.c'
> Skipped 'subversion/mod_dav_svn/static'
> A subversion/mod_dav_svn/static/Makefile.in
> A subversion/mod_dav_svn/static/config.m4
> A subversion/mod_dav_svn/static/README
> Skipped missing target: 'subversion/tests/tests.conf'
> Conflict for property 'svn:ignore' discovered on 'subversion/tests/libsvn_subr'.
> Select: (p) postpone, (df) diff-full, (e) edit,
> (h) help for more options: e
> Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
> (h) help for more options: r
> Skipped missing target: 'subversion/tests/libsvn_subr/cache-test.c'
> U subversion/tests/libsvn_subr
(Here I interrupted the merge with Ctrl-C.)
> julianfoad_at_edith ~/src/subversion-1.5.x
> $ svn st
> M .
> ? remake.log
> ? bin
> ? obj-dir
> M COMMITTERS
> M subversion/bindings/swig
> M CHANGES
>
> julianfoad_at_edith ~/src/subversion-1.5.x
> $ svn st subversion/mod_dav_svn/static/Makefile.in
>
> julianfoad_at_edith ~/src/subversion-1.5.x
> $ svn st -v subversion/mod_dav_svn/static/Makefile.in
> 32171 4371 rassilon subversion/mod_dav_svn/static/Makefile.in
Any ideas?
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-07-18 12:30:32 CEST