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

Re: svn commit: r29111 - trunk/subversion/tests/cmdline

From: David Glasser <glasser_at_davidglasser.net>
Date: Thu, 31 Jan 2008 12:07:56 -0800

Doesn't this lose some information: whether it was copier or merger?
We could add a third...

--dave

On Jan 31, 2008 11:58 AM, <hwright_at_tigris.org> wrote:
> Author: hwright
> Date: Thu Jan 31 11:58:18 2008
> New Revision: 29111
>
> Log:
> Followup to r29075: Instead of using custom user names, just use the generic
> 'second user' in the test suite. This comes in response to authz failures when
> running ra_dav and ra_svn tests.
>
> * subversion/tests/cmdline/log_tests.py
> (merge_history_repos): Replace 'copier' and 'merger' with 'jconstant'
>
>
> Modified:
> trunk/subversion/tests/cmdline/log_tests.py
>
> Modified: trunk/subversion/tests/cmdline/log_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/log_tests.py?pathrev=29111&r1=29110&r2=29111
> ==============================================================================
> --- trunk/subversion/tests/cmdline/log_tests.py (original)
> +++ trunk/subversion/tests/cmdline/log_tests.py Thu Jan 31 11:58:18 2008
> @@ -240,7 +240,7 @@
> svntest.main.run_svn(None, 'cp', 'trunk', branch_a)
> svntest.main.run_svn(None, 'ci', '-m',
> 'Create branches/a from trunk.',
> - '--username', 'copier')
> + '--username', svntest.main.wc_author2)
>
> # Some changes on the branch - r4
> svntest.main.file_append_binary(os.path.join(branch_a, 'iota'),
> @@ -258,14 +258,14 @@
> svntest.main.run_svn(None, 'cp', 'trunk', branch_c)
> svntest.main.run_svn(None, 'ci', '-m',
> 'Create branches/c from trunk.',
> - '--username', 'copier')
> + '--username', svntest.main.wc_author2)
>
> # Do some mergeing - r6
> os.chdir('trunk')
> svntest.main.run_svn(None, 'merge', os.path.join('..', branch_a))
> svntest.main.run_svn(None, 'ci', '-m',
> 'Merged branches/a to trunk.',
> - '--username', 'merger')
> + '--username', svntest.main.wc_author2)
> os.chdir('..')
>
> # Add omicron to branches/a - r7
> @@ -284,7 +284,7 @@
> os.path.join('..', branch_a))
> svntest.main.run_svn(None, 'ci', '-m',
> "Block r7 from merging to trunk.",
> - '--username', 'merger')
> + '--username', svntest.main.wc_author2)
> os.chdir('..')
>
> # Wording change in mu - r9
> @@ -301,7 +301,7 @@
> svntest.main.run_svn(None, 'cp', 'trunk', branch_b)
> svntest.main.run_svn(None, 'ci', '-m',
> "Create branches/b from trunk",
> - '--username', 'copier')
> + '--username', svntest.main.wc_author2)
>
> # Add another file, make some changes on branches/a - r11
> svntest.main.file_append_binary(os.path.join(branch_a, upsilon_path),
> @@ -322,7 +322,7 @@
> svntest.main.run_svn(None, 'merge', os.path.join('..', 'a'))
> svntest.main.run_svn(None, 'ci', '-m',
> "Merged branches/a to branches/b.",
> - '--username', 'merger')
> + '--username', svntest.main.wc_author2)
> os.chdir(os.path.join('..', '..'))
>
> # More wording changes - r13
> @@ -336,7 +336,7 @@
> svntest.main.run_svn(None, 'merge', os.path.join('..', branch_b))
> svntest.main.run_svn(None, 'ci', '-m',
> "Merged branches/b to trunk.",
> - '--username', 'merger')
> + '--username', svntest.main.wc_author2)
> os.chdir('..')
>
> # Even more merging - r15
> @@ -344,7 +344,7 @@
> svntest.main.run_svn(None, 'merge', os.path.join('..', '..', 'trunk'))
> svntest.main.run_svn(None, 'ci', '-m',
> "Bring branches/c up to date with trunk.",
> - '--username', 'merger')
> + '--username', svntest.main.wc_author2)
> os.chdir(os.path.join('..', '..'))
>
> # Modify a file on branches/c - r16
> @@ -365,7 +365,7 @@
> svntest.main.run_svn(None, 'ci', '-m',
> "Merge branches/c to trunk, " +
> "resolving a conflict in 'mu'.",
> - '--username', 'merger')
> + '--username', svntest.main.wc_author2)
> os.chdir('..')
>
> # Restore working directory
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-31 21:08:17 CET

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