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

[PATCH] Merge fails with --depth files

From: Senthil Kumaran S <senthil_at_collab.net>
Date: 2007-08-17 15:03:23 CEST

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 <senthil@collab.net>
Suggested by: kameshj
]]]

Thank You.

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

Received on Fri Aug 17 15:01:19 2007

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