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

[PATCH] wc-replacements branch: Fix revert after merging file replacements

From: Ivan Zhakov <chemodax_at_gmail.com>
Date: 2005-09-20 13:17:30 CEST

This patch fixes revert after merging file replacements.

Fix revert after merging file replacements.

* subversion/libsvn_wc/adm_ops.c
  (revert_admin_things): Rename magic_props_changed to
  because meaning of variable extended. Set force_change_working_file
to TRUE if file was
  replaced to force change working file.
* subversion/tests/clients/cmdline/revert_tests.py
  (test_list): Remove XFail mark from
revert_file_merge_replace_with_history because patch
  fixes it.

PS: win-tests.py passes all tests with this patch.

Ivan Zhakov

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

Received on Tue Sep 20 13:18:18 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.