Send actually *sends* the merge directive

[Lukáš Lalinský]

On Pi, 2007-08-10 at 16:08 -0400, Aaron Bentley wrote:
> A prefix: Your preview patch could not be verified.  That means my
> machine generated a preview patch using the same parameters as yours
> did, and the resulting patch was different from yours.  My machine used
> PatienceSequenceMatcher.  Was yours using the C version?  If the C
> sequence matcher produces different output, that would explain it.

Actually, the problem is that simplemapi.py has CRLF line endings and
MergeDirective2._verify_patch forces the preview patch to LF. I think it
should either not change them, or convert also the calculated diff from
repository:

=== modified file 'bzrlib/merge_directive.py'
--- bzrlib/merge_directive.py   2007-08-09 03:39:31 +0000
+++ bzrlib/merge_directive.py   2007-08-10 21:20:48 +0000
@@ -485,6 +485,7 @@ def _verify_patch(self, repository):
         calculated_patch = self._generate_diff(repository,
self.revision_id,
                                                self.base_revision_id)
         # Convert line-endings to UNIX
+        calculated_patch = re.sub('\r\n?', '\n', calculated_patch)
         stored_patch = re.sub('\r\n?', '\n', self.patch)
         # Strip trailing whitespace
         calculated_patch = re.sub(' *\n', '\n', calculated_patch)

> > === modified file 'bzrlib/config.py'
> > --- bzrlib/config.py	2007-08-10 17:34:14 +0000
> > +++ bzrlib/config.py	2007-08-10 19:06:11 +0000
> > @@ -154,6 +154,7 @@
> >                  'editor': mail_client.Editor,
> >                  'thunderbird': mail_client.Thunderbird,
> >                  'evolution': mail_client.Evolution,
> > +                'windows': mail_client.Windows,
> 
> ^^^ Not sure whether 'mapi' would be better than 'windows'.  This is a
> technical-user's option, since the default will Just Work.

Right, I've renamed it. All other comments should be fixed in the
attached patch, too.

Lukas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-send-mapi.diff
Type: text/x-patch
Size: 23918 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070810/0b0417a1/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Toto je =?ISO-8859-1?Q?digit=E1lne?=
	=?ISO-8859-1?Q?_podp=EDsan=E1?= =?UTF-8?Q?_=C4=8Das=C5=A5?=
	=?ISO-8859-1?Q?_spr=E1vy?=
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070810/0b0417a1/attachment-0001.pgp