On Tue, 23 Nov 2004, Philip Martin wrote:
> "Peter N. Lundblad" <peter@famlundblad.se> writes:
>
> > +static svn_error_t *
> > +diff_props_changed (svn_wc_adm_access_t *adm_access,
> > + svn_wc_notify_state_t *state,
> > + const char *path,
> > + const apr_array_header_t *propchanges,
> > + apr_hash_t *original_props,
> > + void *diff_baton)
> > +{
> > + struct diff_cmd_baton *diff_cmd_baton = diff_baton;
> > + apr_array_header_t *props;
> > + apr_pool_t *subpool = svn_pool_create (diff_cmd_baton->pool);
>
> Normally subpools are used where there is iteration.
>
As I said in the log, and as you detected below, this is just a move. I
don't want to do irrelevant changes in a move, since it is hard to review
when you don't see just the change. I don't know if there is a reason the
subpool is used here. There should have been a comment about it.
> > +static svn_error_t *
> > +diff_file_changed (svn_wc_adm_access_t *adm_access,
> > + svn_wc_notify_state_t *content_state,
> > + svn_wc_notify_state_t *prop_state,
> > + const char *path,
> > + const char *tmpfile1,
> > + const char *tmpfile2,
> > + svn_revnum_t rev1,
> > + svn_revnum_t rev2,
> > + const char *mimetype1,
> > + const char *mimetype2,
> > + const apr_array_header_t *prop_changes,
> > + apr_hash_t *original_props,
> > + void *diff_baton)
> > +{
> > + if (tmpfile1)
> > + SVN_ERR (diff_content_changed (path,
> > + tmpfile1, tmpfile2, rev1, rev2,
>
> Strange indentation.
>
Woops. Sorry.
> > +def merge_keyword_expansions(sbox):
> > + "merge changes to keyword expansion property"
> > +
> > + sbox.build()
> > +
> > + wcpath = sbox.wc_dir
> > + tpath = os.path.join(wcpath, "t")
> > + bpath = os.path.join(wcpath, "b")
> > + t_fpath = os.path.join(tpath, 'f')
> > + b_fpath = os.path.join(bpath, 'f')
> > +
> > + os.mkdir(tpath)
> > + svntest.main.run_svn(None, "add", tpath)
> > + # Commit r2.
> > + svntest.actions.run_and_verify_svn(None, None, [],
> > + "ci", "-m", "r2", wcpath)
> > +
> > + # Copy t to b.
> > + svntest.main.run_svn(None, "cp", tpath, bpath)
> > + # Commit r3
> > + svntest.actions.run_and_verify_svn(None, None, [],
> > + "ci", "-m", "r3", wcpath)
> > +
> > + # Add a file to t.
> > + svntest.main.file_append(t_fpath, "$Revision$")
> > + svntest.actions.run_and_verify_svn(None, None, [],
> > + 'add', t_fpath)
> > + # Ask for keyword expansion in the file.
> > + svntest.actions.run_and_verify_svn(None, None, [],
> > + 'propset', 'svn:keywords', 'Revision',
> > + t_fpath)
> > + # Commit r4
> > + svntest.actions.run_and_verify_svn(None, None, [],
> > + 'ci', '-m', 'r4', wcpath)
> > +
> > + # Update the wc before the merge.
> > + svntest.actions.run_and_verify_svn(None, None, [],
> > + 'update', wcpath)
> > +
>
> If you are not going to use run_and_verify_commit/update then I
> suggest at least a run_and_verify_status before the merge.
>
OK. Fixed.
Thanks for the review,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 24 22:44:27 2004