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

Notifications missing items with 'svn merge'

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Wed, 17 Dec 2008 09:13:31 -0600

Just a minute ago, I tried to bring the 1.5.x-build-fixes branch up-to-date with
the 1.5.x branch (to pull in the fixes to merge test 106). Using a trunk
build from this morning (r34764), I observed the following:

hwright_at_spock:~/dev/svn-1.5.x-2$ svnd merge ^/branches/1.5.x
--- Merging r34739 through r34764 into '.':
U STATUS
hwright_at_spock:~/dev/svn-1.5.x-2$

Hmmm...that's funny, no changes to merge_tests.py? I wonder what status reports:

hwright_at_spock:~/dev/svn-1.5.x-2$ svnd st
 M .
? msg
? p.patch
M STATUS
 M www/images/subversion_logo-200x173.png
 M www/images/subversion-diagram.png
 M www/images/subversion_logo_hor-468x64.png
 M www/images/subversion_logo-384x332.png
 M COMMITTERS
 M notes/tree-conflicts/scratch-pad.txt
 M subversion/include/private
 M subversion/libsvn_wc/adm_ops.c
 M subversion/libsvn_subr
 M subversion/libsvn_client/merge.c
 M subversion/bindings/swig
 M subversion/tests/cmdline/svntest/actions.py
M subversion/tests/cmdline/merge_tests.py
 M CHANGES
hwright_at_spock:~/dev/svn-1.5.x-2$

Sure enough, there were text changes to merge_tests.py, and 'svn diff' confirms
that. Something appears to be awry with the merge notifications.

-Hyrum

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=985765

Received on 2008-12-17 16:13:52 CET

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