Pierre-Yves David <pierre-yves.david@logilab.fr> [Sun, 26 Aug 2012 00:27:44 +0200] rev 17549
checkheads: don't warn about unsynced changes that we ill obsolete
We won't be able to pull them after this push.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Sun, 26 Aug 2012 00:25:33 +0200] rev 17548
checkheads: check successors for new heads in both missing and common
A relevant obsolete marker may have been added -after- we previously
exchanged the changeset. We have to search for remote heads that
disappear by the sole fact of pushing obsolescence.
This case will also happen when remote got the new version from a
repository that does not propagate obsolescence markers.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 24 Aug 2012 16:52:45 +0200] rev 17547
checkheads: attend to phases when computing new heads with obsolete
Checkheads was more permissive than expected. When the remote heads
are public we don't need to search for successors. None will make a
public head disappear.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 01 Aug 2012 19:35:05 +0200] rev 17546
test: add testing of checkheads behavior with obsolete
Expected behavior is quite complex. Explicit testing with clear
scenarios is welcome.
Matt Mackall <mpm@selenic.com> [Thu, 13 Sep 2012 14:33:10 -0500] rev 17545
merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 11 Sep 2012 10:59:21 -0300] rev 17544
i18n-pt_BR: synchronized with f5e86b416e05
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 11 Sep 2012 10:56:23 -0300] rev 17543
merge with i18n
Martin Schröder <martin.schroeder@nerdluecht.de> [Mon, 10 Sep 2012 09:40:42 +0200] rev 17542
i18n-de: Remove unused sprintf parameter
Simon Heimberg <simohe@besonet.ch> [Sat, 28 Jul 2012 23:28:17 +0200] rev 17541
tests: unset variable HG if it is set
When hg tries to call itself it can call a different hg executable when this
variable is set. Some tests fail when the called hg version is different.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 13 Sep 2012 17:46:34 +0200] rev 17540
test-hybridencode: a few more cases
Patrick Mezard <patrick@mezard.eu> [Wed, 12 Sep 2012 22:21:54 +0200] rev 17539
tests: enable more server tests on Windows
Patrick Mezard <patrick@mezard.eu> [Wed, 12 Sep 2012 22:31:54 +0200] rev 17538
test-static-http.t: enable on Windows
We cannot read $! to get the background job process identifier, with
MinGW it can return internal identifiers not matching the native Windows
ones. Instead we introduce a helper script polling on the pid file. We
assume the pid file data will be written in order.
Bryan O'Sullivan <bryano@fb.com> [Tue, 11 Sep 2012 08:36:09 -0700] rev 17537
Merge spelling fixes
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17536
spelling: requested
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17535
en-us: serialization
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17534
en-us: recognized
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17533
en-us: penalize
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17532
en-us: initialization
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17531
en-us: Initialize
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17530
grammar: it-handles
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17529
grammar: rolled-back
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17528
grammar: just-the-heads
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17527
spelling: value
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17526
spelling: update
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17525
spelling: transferred
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17524
spelling: transaction
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17523
spelling: thoroughly
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17522
spelling: syntactic
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17521
spelling: synchronize
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17520
spelling: supersede
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17519
spelling: successfully
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17518
spelling: succeeded
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17517
spelling: Structured
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17516
spelling: split
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17515
spelling: specific
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17514
spelling: shouldn't
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17513
spelling: sentinel
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17512
spelling: responsibility
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17511
spelling: relies
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17510
spelling: release
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17509
spelling: recursion
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17508
spelling: propagated
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17507
spelling: primarily
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17506
spelling: prior
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17505
spelling: precede
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17504
spelling: override
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17503
spelling: operations
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17502
spelling: multiple
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17501
spelling: Macintosh
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17500
en-us: labeled
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17499
spelling: just
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17498
spelling: journaling
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17497
spelling: deactivates
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17496
spelling: implementing
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17495
spelling: indented
* * *
spelling: indented
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17494
spelling: further
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17493
spelling: following
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17492
spelling: nonexistent
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17491
spelling: existence
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17490
spelling: exercise