>>>>> "john" == John Arbash Meinel <[EMAIL PROTECTED]> writes:
john> https://bugs.launchpad.net/bugs/279831
john> John
john> =:->
john> # Bazaar merge directive format 2 (Bazaar 0.90)
john> # revision_id: [EMAIL PROTECTED]
john> # target_branch:
http://bzr.arbash-meinel.com/plugins/DEACTIVATED/gtk-\
john> # trunk
john> # testament_sha1: 9721a8872319ee343509a22214e5f45ad2ce75f6
john> # timestamp: 2008-10-07 15:59:39 -0500
john> # source_branch: http://bzr.arbash-meinel.com/plugins/gtk
john> # base_revision_id: [EMAIL PROTECTED]
john> #
john> # Begin patch
john> === modified file 'diff.py'
john> --- diff.py 2008-07-25 13:32:06 +0000
john> +++ diff.py 2008-10-07 20:59:01 +0000
john> @@ -689,7 +689,7 @@
john> change_type = kind_changed
john> display_path = (paths[0] + source_marker
john> + ' => ' + paths[1] + marker)
john> - elif changed_content is True or executables[0] !=
executables[1]:
john> + elif changed_content or executables[0] !=
executables[1]:
john> change_type = modified
john> else:
john> assert False, "How did we get here?"
BB:approve
I'll merge it (I'm not sure I will be able to correctly attribute
to you though, check your public branch next time ;-)
Vincent
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
