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

svn merge - start revision off by one, and repeat merge is not a no-op

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Mon, 25 Jan 2010 14:30:13 +0000

The notification "Merging ... r891676 through ..." doesn't match the
actual recorded svn:mergeinfo "r891677-...".

Full Details

I tried a merge in a clean WC of the branch 1.6.x_at_902803, using an
r902780M trunk build of svn. (I confirmed with an r902508 trunk build
that excludes the recent patch to add notifications when mergeinfo is
being recorded. The results are the same except lacking the extra
notifications.)

[[[
$ svn merge --dry-run ^/subversion/branches/1.6.x-r891672/@902803
--- Merging r891676 through r902803 into '.':
U subversion/tests/cmdline/externals_tests.py
U subversion/libsvn_client/commit_util.c

$ svn merge ^/subversion/branches/1.6.x-r891672/@902803
--- Merging r891676 through r902803 into '.':
U subversion/tests/cmdline/externals_tests.py
U subversion/libsvn_client/commit_util.c
--- Recording mergeinfo for merge of r891676 through r902803 into '.':
 U .

$ svn diff -N

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /subversion/branches/1.6.x-r891672:r891677-902803
]]]

Is that difference in the start revision of the range expected? (The
merge saying it's recording "r891676 through ..." versus diff showing
that ":r891677-..." was recorded. And a propget confirms the diff.)

- Julian
Received on 2010-01-25 15:30:51 CET

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