# 
# patch "ChangeLog"
#  from [d2553e8249efe1fe61172d113079f84b86b21b23]
#    to [a0625edb240107bd810ad7e094af0e347271b38a]
# 
# patch "restrictions.cc"
#  from [a2c9b4ec291eb22ed849af535ffec2fc4de253d9]
#    to [08affd2e33496704cc881807f3dd408a9f2a4129]
# 
# patch "tests/t_restriction_with_exclude_iprint.at"
#  from [4a5f81447a9aef3715473d174138a2ad610d7d00]
#    to [9eeb53c39d2dc0fe57457a538e4765ad15dfe1ee]
# 
========================================================================
--- ChangeLog	d2553e8249efe1fe61172d113079f84b86b21b23
+++ ChangeLog	a0625edb240107bd810ad7e094af0e347271b38a
@@ -1,3 +1,9 @@
+2005-09-20  Timothy Brownawell  <address@hidden>
+
+	* restrictions.cc: Make calculate_unrestricted_revision work
+	with --exclude
+	* tests/t_restriction_with_exclude_iprint.at: remove XFAIL
+
 2005-09-20  Patrick Mauritz <address@hidden>
 
 	* configure.ac: solaris needs librt for fdatasync
========================================================================
--- restrictions.cc	a2c9b4ec291eb22ed849af535ffec2fc4de253d9
+++ restrictions.cc	08affd2e33496704cc881807f3dd408a9f2a4129
@@ -244,7 +244,10 @@
                                 manifest_map & m_new)
 {
   std::vector<utf8> empty_args;
+  std::set<utf8> saved_exclude_patterns(app.exclude_patterns);
+  app.exclude_patterns.clear();
   calculate_restricted_revision(app, empty_args, rev, m_old, m_new);
+  app.exclude_patterns = saved_exclude_patterns;
 }
 
 void
========================================================================
--- tests/t_restriction_with_exclude_iprint.at	4a5f81447a9aef3715473d174138a2ad610d7d00
+++ tests/t_restriction_with_exclude_iprint.at	9eeb53c39d2dc0fe57457a538e4765ad15dfe1ee
@@ -1,8 +1,6 @@
-AT_SETUP([use restrictions with --exclude])
+AT_SETUP([use restrictions with --exclude and inodeprints])
 MONOTONE_SETUP
 
-AT_XFAIL_IF(true)
-
 AT_CHECK(mkdir foo)
 AT_DATA(file1, [x
 ])