# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bzrdev@chad.org-20080123022041-tzdg9k0zkebq3tn8
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev/
# testament_sha1: d6c7672bdda6650a46bd0634cbc946fe91fc5555
# timestamp: 2008-01-22 21:21:47 -0500
# source_branch: last:1
# base_revision_id: pqm@pqm.ubuntu.com-20080121072020-0eye263yx2bmir2b
# 
# Begin patch
=== modified file 'bzrlib/msgeditor.py'
--- bzrlib/msgeditor.py	2007-11-17 17:22:08 +0000
+++ bzrlib/msgeditor.py	2008-01-23 02:20:41 +0000
@@ -77,6 +77,22 @@
                     config.config_filename())
 
 
+def comments_per_file_wanted(branch):
+    config = branch.get_config()
+    enable_per_file_comments = config.get_user_option('per_file_comments')
+
+    if enable_per_file_comments is None:
+        # Ugly hack to transition bzr-gtk use of wrong word.
+        enable_per_file_comments = config.get_user_option('per_file_commits')
+
+        if enable_per_file_comments is None:
+            return False
+        else:
+            mutter("'per_file_commits' in your config file should be changed to 'per_file_comments' eventually.")
+
+    return enable_per_file_comments.lower() in ('y', 'yes', 'on', 'enable', '1', 't', 'true')
+
+
 DEFAULT_IGNORE_LINE = "%(bar)s %(msg)s %(bar)s" % \
     { 'bar' : '-' * 14, 'msg' : 'This line and the following will be ignored' }
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYwRiEMAAdvfgERQWef//1uj
AgC/7//wUAS4N5obu26KErdSEkgSk/VPTwgp5T9BT2TU9BRk2p6jCNHqAkqNGmhkymUxGjQNNABp
oANDQSmpoIJkepGk80mkehqDIyBhqNAHNMTAAmACYAATAAEwSRJqY0E0001PTSnmpqABoeUANNNG
gjIYTXhq5dx47DvXPSwh38zuQsbMJorXTJ4txQY86h0PhdhUZmmMYQtyaqby/Fus+nIhKXgfmMxZ
46IOV8Ly3z7XPXq0+J2PYtyhKJEeXVfTmW7+8dcMVG22ycy6j4XKEPrBsE6JPAuwphetflOdmbZ5
92Usd845tvBbezpyGj0Uc6UB79L7TJC5YZ/VpmGOSgJZWELnhrXOUVKyh8UCvTczzD5UBZHlylO/
EKOK98aYbFbXAdYBQrlpbAss3dbmC/ULZ0TvGAlyIkEEF7haaRmFjQmZlpcdSMUE5TInIFDDHl9n
RcBTFxayos0dLS3Wt8C0EUIvKLBi9NV33RUqO8y+Z112zkQsN5g02FTqWtJ1KIpoC7JlkRwIhUvF
ROMNlQqLTMpC9iszPAWtY1SnMXFAbYTQcpNeonvmNt5GqjsK13EDpGaa4oMLoSe+ZMZVGa2mJI6k
LGlOQTtwpN0lEvvyKC4HG5ld6dUak7ugiXGG2DFx5CnLXJgiMHuptWOstHl7SgaQN0lE0C7qE6qM
0YJiYoloR3nNdWF0YrWI6yO26GjQoPcWeZx5Pi4mZz6Er1CiTJLjOGc/dYN6KjBWoxgQeCBxMXuu
7PMJU3yDeOENBkNtA8WnQZ9+wCEjEHfLUbHmDVrsn23QE7Wm7G47qJjQXn0KyWA0hMsoqrZGVM75
eXcPTNuXfVaWDnMbkKviYrDwSunIExov8lFhi214MR+Q24ZvXZzxJTyTJsZgUIrO8lNVOlgK4oV9
OHPw3uyjoQfSxGw1ck82aHTdhonYq4HiV4Y2qEQBhV+QroSZY+34e46Hp57nXKXRVpOGZOKstdPh
rpzQeIkmDTcYlgpPYSAtHAksFH35SG0IOZHmPqMQHMzmUHFGr0q7uCBzMRZG5ph5kcwmMosBQsWC
v+/WkzBIMTgLChtrEStOqtaiWNES+/IZwR/ckiorYjvCmNz+dkZpZGTJWrbPE3bwJVKZDs/xJxq2
+wuAs4RlMpjauTJDIaGq0fFxa18LZqDjpeb16qfNseqFYbgOnHXm21RRWhT+g7qW8aCqcZx0ZCYW
Iqz1VL+T74OicBhnv5TEKWZOyFqTDrtqDtssOABI+rCP8WwRIVpOTpctaT1tgslB47dVZp2a1AhQ
GAzDSCFePzXKkqqGoNi0FSKG9pPmwZKZOZgyFOFSxz0pSqFxdt3ThKZMrSfXYxXD81Mgk4qmGxdt
7kmQ0kJCeB7TZek2rYyMxoLgLXta43KjEH5oaZqBtmwnKvBlFpcOmyunmvuGDZYHJEjqFUDVoDFn
VUxFIQXptTkGMS2RwGxY6G4chLth7JcpwHar2lTI25wNDIYlHqvpYsUdbWNpjnuWzmRCMU1Uuypz
RZDWKrBI/xdyRThQkIwRiEM=