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

2-URL merge prints notifications for files it's not changing

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 04 Sep 2008 13:23:29 +0100

This merge prints notification "U" for several files that it's not
actually modifying. This is with svn 1.5.2.

[[[
> $ svn diff --summarize $SVN_REPOS/trunk_at_32867 $SVN_REPOS/branches/double-delete_at_32895
> M http://svn.collab.net/repos/svn/trunk/subversion/tests/cmdline/commit_tests.py
> M http://svn.collab.net/repos/svn/trunk/subversion/libsvn_ra_serf/commit.c
> M http://svn.collab.net/repos/svn/trunk/subversion/libsvn_ra_neon/commit.c
> M http://svn.collab.net/repos/svn/trunk/subversion/libsvn_repos/commit.c
> M http://svn.collab.net/repos/svn/trunk
>
> $ svn merge $SVN_REPOS/trunk_at_32867 $SVN_REPOS/branches/double-delete_at_32895
> --- Merging differences between repository URLs into '.':
> U www/merge-tracking/design.html
> U www/images/ubuntu.png
> U www/images/svn-dav-securityspace-survey.png
> U www/hacking.html
> U win-tests.py
> U TRANSLATING
> U subversion/tests/cmdline/commit_tests.py
> U subversion/libsvn_ra_serf/commit.c
> U subversion/libsvn_ra_neon/commit.c
> U subversion/libsvn_repos/commit.c
> U tools/hook-scripts/svn2feed.py
> U tools/hook-scripts/mailer/mailer.py
> U contrib/client-side/svnmerge/svnmerge-migrate-history.py
> U contrib/client-side/svnmerge/svnmerge.py
> U contrib/client-side/emacs/psvn.el
> U contrib/server-side/add-needs-lock.py
> U INSTALL
> U .
>
> $ svn status
> M .
> M build.conf
> M www/issue-tracker.html
> M www/development.html
> M www/tasks.html
> M notes/tree-conflicts/requirements.txt
> M subversion/libsvn_subr
> M subversion/tests/libsvn_subr
> M subversion/tests/cmdline/commit_tests.py
> M subversion/include
> M subversion/libsvn_ra_serf/commit.c
> M subversion/libsvn_ra_neon/commit.c
> M subversion/libsvn_repos/commit.c
> M tools/server-side/test_svn_server_log_parse.py
> M tools/server-side/svn_server_log_parse.py
]]]

No status is shown for most files the merge claimed to have touched.

What's up? Known issue?

It may be harmless but it is confusing.

- 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-09-04 14:23:55 CEST

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