[PATCH] url: fix trailing whitespace found by check-code
adrian at cadifra.com
Wed Dec 22 14:31:08 CST 2010
On 2010-12-22 21:15, Augie Fackler wrote:
> On Wed, Dec 22, 2010 at 2:11 PM, Adrian Buehlmann <adrian at cadifra.com> wrote:
>> On 2010-12-22 20:11, Augie Fackler wrote:
>>> # HG changeset patch
>>> # User Augie Fackler <durin42 at gmail.com>
>>> # Date 1293045057 21600
>>> # Node ID 0356290cd193a4ab428f6e7eda21a70c5dcccf81
>>> # Parent c6e00dfcdcb820c3af4db4a81b1dac4bb136b247
>>> url: fix trailing whitespace found by check-code
>>> diff --git a/mercurial/url.py b/mercurial/url.py
>>> --- a/mercurial/url.py
>>> +++ b/mercurial/url.py
>>> @@ -546,7 +546,7 @@
>>> self.ui.warn(_("warning: %s certificate not verified "
>>> - "(check web.cacerts config setting)\n") %
>>> + "(check web.cacerts config setting)\n") %
>> Did you see http://selenic.com/repo/hg/rev/04c8f3787546
>> and http://selenic.com/repo/hg/rev/f9d29777b4eb ?
> No, missed those.
>> The "core developers" :) probably haven't yet pulled main into crew...
>> I recommend pulling from
> I already explicitly pull from both crew and mpm (I don't use
> crew+main because it wouldn't work with remotebranches well), but I
> never merge the heads because it's not like I can do anything useful
> with merges anyway, so they always result in strips.
Ideally, crew members should avoid creating gratuitous merges by pulling
main before applying their changes.
So, normally, there shouldn't more than one head in crew+main...
> Sorry for the noise.
>> which contains a automatic pulls from crew *and* main 
>>  http://mercurial.selenic.com/wiki/DeveloperRepos
More information about the Mercurial-devel