# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: iwata0303@gmail.com-20100709170238-9udif84izyljoxgq # target_branch: lp:tortoisebzr # testament_sha1: 3450141b2206834d92b9488d6c18129de738b224 # timestamp: 2010-07-10 02:06:57 +0900 # base_revision_id: songofacandy@gmail.com-20100609214937-\ # zi74a0drma329tq3 # # Begin patch === modified file 'tbzrlib/vcspath.py' --- tbzrlib/vcspath.py 2010-04-26 00:52:23 +0000 +++ tbzrlib/vcspath.py 2010-07-09 17:02:38 +0000 @@ -111,7 +111,10 @@ def is_matched(self, wildcards): # Two or more wildcard expression can specified by separated by \n. # Sub directories of matched directory are also treated matched. - path = self.directory.path + '\\' + if not wildcards: + return False + + path = self.path + '\\' for wildcard in wildcards.split('\n'): wildcard = wildcard.strip() if wildcard and fnmatch.fnmatch(path, wildcard + u'\\*'): # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXwjG4YAAZLfgARQUOv/93Ng BIS////wUAOV4AVW2By8NCp6aZQ2pqPNU81T0jPVP0iYEMhpiANFNGp6mmjT0aammQ0AABk0AA0i P1Uep6DUNAGQABkAAAcwAAAAAAAAAAJJE0yAEMTJohqZTTyZJoA8TKILYyZR1RVi8lsEzSXK6ADe clU+h6EgHCZZ4+JN85mYr4CZU5jIiO7Vp+emPDo5xhls+f33a/4woWvxQdW8od2ah1sUxk5kf12n k0iR/nt7IJqYixt22pvFfH2ERs00oV/HN0bbNds5xdzN2srWQYrqwhzHAT8Up8kskZLc4RiykKdS VKqpU76yDLnMIiqcyrrE/hnzfcuJlGi/XG6pr1J+9bWUfiQyD8fUid8PJq7biOZkZSHKUzdFkhOL VSRsqFC5ijjlz1hyFXJb5graq2Vj0nRw3rWHI3U12KysUDTsoS4c7xh20q2wcDDRru5YWTqHMd4c nPNyzVdQrXUYttdvqvULXzvtwXZQJxJX4XWzWqPJpSirGatlQmFOKeA5aJ+NVShJxEhg41pnFjJO NOjCzqVUiks/V5Brb7pzVe/J6vQdliq045zcJa3PZ0xAgsxc+bWTTuKt797PxZ+U0HTE7kz2mREI xbT7FR3UWyrCG/NokVhFPz6NFBgxyRwv39NvHFUwhl3YBsehFcSgcFz4fPXxW/0e110rvQKhFvp6 yfD6rxapEj5SZyGs8qp3X66QMW/TsmWqvPpOoSAaGWoyhxeGpN1MKqEmwH6ghk/ldXDzw6OKKVMt xqn+kFLliVPmebhbHHVdJ/5rWFZ1BNS6MAzMdjOdx9QGfFooplxtiO7cZTCk5CZ2QERraMhGUFky 7j74POljSDCUuD4wFLQpYK4qoiVozrHWUbzrMIOnR7iHLuF3mRxZNoEvF7YOfWpzHZctWs/v4Xw6 XvsBwEX8VAyv/YMPp8awmzDvCzgS+noeo1FNxTLzEwvPabR2Ogdr+4R0CIMqGDLrfOE3RoVeouPX Oarz/QRSvuIY6NyUdbh9ilCBCe6C6tNRG14OU3F45TwniiDJlr202rNIgHfxUCcIr7OW1vylwtz4 OZb/CxTkqt8a5LchyyTsDLFUhs/RkfNXLcS7KfoqlfdDCMJlItwpkyF1CQxlQmhlAUqokBSZIAQp 5AyR1940IX9oWiPmPQ+WxEViEgxRAtAhRk6LNJaNwxz12BJRkc2yzd4NaqwtSvTYtuFMqdExwwWw tF6LCkeqNOBML4XckU4UJB8IxuGA