Re: [PATCH] wc-replacements branch: Implement reverting after svn cp URL PATH replacements

On 9/19/05, Ivan Zhakov <chemodax@gmail.com> wrote:
> On 9/18/05, Erik Huelsmann <ehuels@gmail.com> wrote:
> > On 9/14/05, Ivan Zhakov <chemodax@gmail.com> wrote:
> > > Hi, Erik and Devs!
> > >
> > > [[
> > > Implement reverting after svn cp URL PATH replacements.
> > >
> > > * subversion/libsvn_wc/update_editor.c
> > > (svn_wc_add_repos_file): Check if we're replacing the file then copy
> > > text base and prop base
> > > to text and prop revert file.
> > > * subversion/tests/clients/cmdline/revert_tests.py
> > > (revert_replacement_with_props): New helper for
> > > revert_wc_to_wc_replace_with_props and
> > > revert_repos_to_wc_replace_with_props.
> > > (revert_wc_to_wc_replace_with_props): Renamed from
> > > revert_replace_with_history_with_props. Use new helper
> > > revert_replacement_with_props.
> > > (revert_repos_to_wc_replace_with_props): New test of reverting svn cp URL PATH
> > > replacements.
> > > (test_list): Add new test revert_repos_to_wc_replace_with_props. Rename
> > > revert_replace_with_history_with_props to revert_wc_to_wc_replace_with_props.
> > > ]]
> >
> > Hi Ivan!
> >
> > Sorry for my late reaction, I've had a busy week.
> >
> > There's one problem with this patch: merge_tests.py 26 fails after
> > applying it. I'm investigating why, but in case I don't resolve the
> > issue tomorrow, I thought I'd let you know.
> I have investigated this problem. To my great surprise in some
> situations prop-base absent for versioned file. Is it ok and I should
> check that prop-base file exists?
Erik,
Check for fixed patch. I added check for presence of prop base file
when replacing.

[[
Implement reverting after svn cp URL PATH replacements.

* subversion/libsvn_wc/update_editor.c
  (svn_wc_add_repos_file): Check if we're replacing the file then copy
  text base and prop base to text and prop revert file.
* subversion/tests/clients/cmdline/revert_tests.py
  (revert_replacement_with_props): New helper for
  revert_wc_to_wc_replace_with_props and
  revert_repos_to_wc_replace_with_props.
  (revert_wc_to_wc_replace_with_props): Renamed from
  revert_replace_with_history_with_props. Use new helper
  revert_replacement_with_props.
  (revert_repos_to_wc_replace_with_props): New test of reverting svn cp URL PATH
  replacements.
  (test_list): Add new test revert_repos_to_wc_replace_with_props. Rename
  revert_replace_with_history_with_props to revert_wc_to_wc_replace_with_props.
]]

-- 
Ivan Zhakov

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