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

RE: [PATCH] Merge fails with --depth files

From: Paul Burba <pburba_at_collab.net>
Date: 2007-08-31 15:50:05 CEST

> -----Original Message-----
> From: Kamesh Jayachandran [mailto:kamesh@collab.net]
> Sent: Sunday, August 19, 2007 1:54 PM
> To: Senthil Kumaran Shanmuga Sundram; dev@subversion.tigris.org
> Subject: RE: [PATCH] Merge fails with --depth files
>
> Thanks Senthil.
>
> Committed with small tweaks in r26177.
>
> With regards
> Kamesh Jayachandran

Hi Senthil,

Some local mods of mine were resulting in an XPASS for the
'merge_with_depth_files' test, prompting me to look at the test. It
didn't appear the test's criteria for passing were sufficient.
Specifically the test used
svntest.actions.run_and_verify_svn(...'merge'...) rather than
svntest.actions.run_and_verify_merge(). We do need to use the former
when merging into file paths due to test suite limitations. But when
possible we should use the latter as it is more comprehensive, and in
particular we should set the 'check_props' arg to true. Since
svn:mergeinfo is so essential to merges in the 1.5 world, we definitely
want to check it as part of any merge.

I tweaked the 'merge_with_depth_files' test a bit in r26404 to use
run_and_verify_merge() and to examine the resulting mergeinfo.

Also, there is helper function in merge_tests.py called 'setup_branch'
that creates one or more copies of 'A' ('A_COPY_1', 'A_COPY_2', etc.)
and then makes some text mods under 'A' to be merged to the branches.
It might prove useful in any merge tests you write in the future.

Paul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 31 15:50:19 2007

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