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

Re: svn commit: r15001 - in trunk/subversion: include libsvn_client libsvn_wc

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-06-07 20:57:52 CEST

julianfoad@tigris.org writes:

> Author: julianfoad
> Date: Tue Jun 7 11:38:36 2005
> New Revision: 15001
>
> Modified:
> trunk/subversion/include/svn_wc.h
> trunk/subversion/libsvn_client/add.c
> trunk/subversion/libsvn_wc/status.c
> trunk/subversion/tests/clients/cmdline/basic_tests.py
>
> Log:
> Fix issue #2243: make 'svn add' honor svn:ignore property.

> +def basic_add_local_ignores(sbox):
> + 'ignore files matching local ignores in added dirs'
> +
> + #Issue #2243
> + #svn add command not keying off svn:ignore value
> + sbox.build()
> + wc_dir = sbox.wc_dir
> +
> + dir_path = os.path.join(wc_dir, 'dir')
> + file_path = os.path.join(dir_path, 'app.lock')
> +
> + os.mkdir(dir_path, 0755)
> + open(file_path, 'w')
> +
> + svntest.main.run_svn(None, 'propset', 'svn:ignore', '*.lock', wc_dir)

This sets svn:ignore on the directory:

  svn-test-work/working_copies/basic_tests-24

> + output, err = svntest.actions.run_and_verify_svn(
> + "No output where some expected", SVNAnyOutput, None,
> + 'add', dir_path)

This adds the directory

  svn-test-work/working_copies/basic_tests-24/dir

> +
> + for line in output:
> + # If we see app.lock in the add output, fail the test.
> + if re.match(r'^A\s+.*.lock$', line):
> + raise svntest.actions.SVNUnexpectedOutput

This checks that the file:

  svn-test-work/working_copies/basic_tests-24/dir/app.lock

did not get added.

svn:ignore on "basic_tests-24" does not normally affect files in
"basic_tests-24/dir/", but it appears that svn:ignore has been made
recursive in this case. After running the test "svn status" shows

$ svn st svn-test-work/working_copies/basic_tests-24/
 M svn-test-work/working_copies/basic_tests-24
? svn-test-work/working_copies/basic_tests-24/dir/app.lock
A svn-test-work/working_copies/basic_tests-24/dir

The recursive behaviour is inconsistent, is it really what we want?

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jun 7 20:59:01 2005

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