Mainline has been stage two for a while now (April 26th) as per
I don't know if "open for all maintainers" needs to be changed so I left
it alone.
Index: index.html
RCS file: /,v
retrieving revision 1.504
diff -u -3 -p -r1.504 index.html
index.html5 Jun 2005 17:22:25 -00001.504
index.html5 Jun 2005 21:47:33 -0000
@@ -68,7 +68,7 @@ mission statement</a>.</p>
</dt><dd>
Branch status:
<a href="">2005-05-04</a>
- (<a href="develop.html#stage1">stage 1</a>; open for all maintainers).
+ (<a href="develop.html#stage2">stage 2</a>; open for all maintainers).
</dd>
</dl>

Sun, 5 Jun 2005, R Hill wrote:
Mainline has been stage two for a while now (April 26th) as per

You're right. I had not updated that when last touching this part because
at that point I understood there still was the chance for some stage 1
changes getting.

I don't know if "open for all maintainers" needs to be changed so I left
it alone.

That's okay, we usually only get stricter on the release branches or close
towards branch creation.

For some reason your patch did not apply for me, so I made the changes
manually and commit them. Thanks!

Gerald

Gerald Pfeifer wrote:
For some reason your patch did not apply for me, so I made the changes
manually and commit them. Thanks!

Hmm, that's the second time that's happened. Do you see anything
obviously wrong with the diff? I think I might start doing manual diffs
instead of using cvs from now on.

Sun, 5 Jun 2005, R Hill wrote:
>For some reason your patch did not apply for me, so I made the changes
>manually and commit them. Thanks!
Hmm, that's the second time that's happened. Do you see anything
obviously wrong with the diff? I think I might start doing manual
diffs instead of using cvs from now on.

No, I couldn't find anything, and I was looking for UNIX vs Windows
end-of-line markers and stuff like that as well. Perhaps someone
else on this list has an idea?

Gerald

R Hill wrote:
Gerald Pfeifer wrote:
For some reason your patch did not apply for me, so I made the changes
>manually and commit them. Thanks!

Hmm, that's the second time that's happened. Do you see anything
obviously wrong with the diff? I think I might start doing manual diffs
instead of using cvs from now on.

nm, i think the problem is I have this:

RCS file: /,v

where it should be this:

RCS file: /,v

R Hill wrote:
>Gerald Pfeifer wrote:
>For some reason your patch did not apply for me, so I made the change
>manually and commit them. Thanks!

Hmm, that's the second time that's happened. Do you see anything
obviously wrong with the diff? I think I might start doing manual
diffs instead of using cvs from now on.

Nothing is actually wrong with diff or cvs diff; what is "wrong" is that
you are using Mozilla Thunderbird and cut-and-pasting your patches into
the text.

Thunderbird, by default uses Format Flowed (RFC 2646), which is
generally a nice feature but since it will reformat linebreaks makes
included patches unuseable.

Two potential fixes.

a) Turn off sending in format flowed.

Add the following line to your users.js:
user_pref("mailnews.send_plaintext_flowed", false);

b) Attach your patches instead of cut-and-pasting them into the text.
As long as there are no eight bit characters, Thunderbird is smart
enough to attach them as inline text instead BASE64. This is the better
solution, IM

Kelley Cook