[PATCH] Merge fails with --depth files

[Senthil Kumaran S <se...@collab.net>]

Hi,

I am attaching a patch along with this mail which has an XFail test 
which performs a merge with the option "--depth files", and we are 
unable to lock the sub directories, which leads to a merge failure.

This also holds good for other options of depth such as empty and 
immediates, except for infinity.

[[[
Testcase to prove the following defect.

  When we try to merge with --depth files, we are unable to lock
  the sub directories, which leads to a merge failure.

    * subversion/tests/cmdline/merge_tests.py
      (merge_with_depth_files): New function.
      (test_list): Add 'merge_with_depth_files' to test_list

Patch by: Senthil Kumaran <se...@collab.net>
Suggested by: kameshj
]]]

Thank You.

--
Senthil Kumaran S
http://www.stylesen.org/

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

[Senthil Kumaran S <se...@collab.net>]

Hi Paul,

Paul Burba wrote:
> 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.

Thank you for explaining me, about writing merge tests in detail. I 
shall use it in my future test cases :)

--
Senthil Kumaran S
http://www.stylesen.org/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

[Paul Burba <pb...@collab.net>]

> -----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

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

[Kamesh Jayachandran <ka...@collab.net>]

Thanks Senthil.

Committed with small tweaks in r26177.

With regards
Kamesh Jayachandran