Thu, 13 Sep 2012 17:00:56 -0700 Merge with mpm
Bryan O'Sullivan <bryano@fb.com> [Thu, 13 Sep 2012 17:00:56 -0700] rev 17552
Merge with mpm
Sun, 26 Aug 2012 01:28:22 +0200 bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Sun, 26 Aug 2012 01:28:22 +0200] rev 17551
bookmark: take successors into account when updating (issue3561) When we rewrite a bookmarked changeset, we want to update the bookmark on its successors. But the successors are not descendants of its precursor (by definition). This changeset alters the bookmarks logic to update bookmark location if the newer location is a successor of the old one[1]. note: valid destinations are in fact any kind of successors of any kind of descendants (recursively.) This changeset requires the enabling of the obsolete feature in some bookmark tests.
Sun, 26 Aug 2012 00:28:56 +0200 bookmarks: extract valid destination logic in a dedicated function
Pierre-Yves David <pierre-yves.david@logilab.fr> [Sun, 26 Aug 2012 00:28:56 +0200] rev 17550
bookmarks: extract valid destination logic in a dedicated function We usually update bookmarks only if the new location is descendant of the old bookmarks location. We extract this logic into a function. This is the first step to allow more complex logic using obsolescence in this validation of the bookmark movement.
Sun, 26 Aug 2012 00:27:44 +0200 checkheads: don't warn about unsynced changes that we ill obsolete
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.
Sun, 26 Aug 2012 00:25:33 +0200 checkheads: check successors for new heads in both missing and common
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.
Fri, 24 Aug 2012 16:52:45 +0200 checkheads: attend to phases when computing new heads with obsolete
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.
Wed, 01 Aug 2012 19:35:05 +0200 test: add testing of checkheads behavior with obsolete
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.
Thu, 13 Sep 2012 14:33:10 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 13 Sep 2012 14:33:10 -0500] rev 17545
merge with stable
Tue, 11 Sep 2012 10:59:21 -0300 i18n-pt_BR: synchronized with f5e86b416e05 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 11 Sep 2012 10:59:21 -0300] rev 17544
i18n-pt_BR: synchronized with f5e86b416e05
Tue, 11 Sep 2012 10:56:23 -0300 merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 11 Sep 2012 10:56:23 -0300] rev 17543
merge with i18n
Mon, 10 Sep 2012 09:40:42 +0200 i18n-de: Remove unused sprintf parameter stable
Martin Schröder <martin.schroeder@nerdluecht.de> [Mon, 10 Sep 2012 09:40:42 +0200] rev 17542
i18n-de: Remove unused sprintf parameter
Sat, 28 Jul 2012 23:28:17 +0200 tests: unset variable HG if it is set
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.
Thu, 13 Sep 2012 17:46:34 +0200 test-hybridencode: a few more cases
Adrian Buehlmann <adrian@cadifra.com> [Thu, 13 Sep 2012 17:46:34 +0200] rev 17540
test-hybridencode: a few more cases
Wed, 12 Sep 2012 22:21:54 +0200 tests: enable more server tests on Windows
Patrick Mezard <patrick@mezard.eu> [Wed, 12 Sep 2012 22:21:54 +0200] rev 17539
tests: enable more server tests on Windows
Wed, 12 Sep 2012 22:31:54 +0200 test-static-http.t: enable 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.
Tue, 11 Sep 2012 08:36:09 -0700 Merge spelling fixes
Bryan O'Sullivan <bryano@fb.com> [Tue, 11 Sep 2012 08:36:09 -0700] rev 17537
Merge spelling fixes
Fri, 17 Aug 2012 13:58:19 -0700 spelling: requested
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17536
spelling: requested
Fri, 17 Aug 2012 13:58:19 -0700 en-us: serialization
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17535
en-us: serialization
Fri, 17 Aug 2012 13:58:19 -0700 en-us: recognized
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17534
en-us: recognized
Fri, 17 Aug 2012 13:58:19 -0700 en-us: penalize
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17533
en-us: penalize
Fri, 17 Aug 2012 13:58:19 -0700 en-us: initialization
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17532
en-us: initialization
Fri, 17 Aug 2012 13:58:19 -0700 en-us: Initialize
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17531
en-us: Initialize
Fri, 17 Aug 2012 13:58:19 -0700 grammar: it-handles
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17530
grammar: it-handles
Fri, 17 Aug 2012 13:58:19 -0700 grammar: rolled-back
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17529
grammar: rolled-back
Fri, 17 Aug 2012 13:58:19 -0700 grammar: just-the-heads
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17528
grammar: just-the-heads
Fri, 17 Aug 2012 13:58:19 -0700 spelling: value
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17527
spelling: value
Fri, 17 Aug 2012 13:58:19 -0700 spelling: update
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17526
spelling: update
Fri, 17 Aug 2012 13:58:19 -0700 spelling: transferred
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17525
spelling: transferred
Fri, 17 Aug 2012 13:58:19 -0700 spelling: transaction
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17524
spelling: transaction
Fri, 17 Aug 2012 13:58:19 -0700 spelling: thoroughly
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17523
spelling: thoroughly
Fri, 17 Aug 2012 13:58:19 -0700 spelling: syntactic
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17522
spelling: syntactic
Fri, 17 Aug 2012 13:58:19 -0700 spelling: synchronize
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17521
spelling: synchronize
Fri, 17 Aug 2012 13:58:19 -0700 spelling: supersede
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17520
spelling: supersede
Fri, 17 Aug 2012 13:58:19 -0700 spelling: successfully
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17519
spelling: successfully
Fri, 17 Aug 2012 13:58:19 -0700 spelling: succeeded
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17518
spelling: succeeded
Fri, 17 Aug 2012 13:58:19 -0700 spelling: Structured
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17517
spelling: Structured
Fri, 17 Aug 2012 13:58:19 -0700 spelling: split
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17516
spelling: split
Fri, 17 Aug 2012 13:58:19 -0700 spelling: specific
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17515
spelling: specific
Fri, 17 Aug 2012 13:58:19 -0700 spelling: shouldn't
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17514
spelling: shouldn't
Fri, 17 Aug 2012 13:58:19 -0700 spelling: sentinel
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17513
spelling: sentinel
Fri, 17 Aug 2012 13:58:19 -0700 spelling: responsibility
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:19 -0700] rev 17512
spelling: responsibility
Fri, 17 Aug 2012 13:58:18 -0700 spelling: relies
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17511
spelling: relies
Fri, 17 Aug 2012 13:58:18 -0700 spelling: release
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17510
spelling: release
Fri, 17 Aug 2012 13:58:18 -0700 spelling: recursion
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17509
spelling: recursion
Fri, 17 Aug 2012 13:58:18 -0700 spelling: propagated
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17508
spelling: propagated
Fri, 17 Aug 2012 13:58:18 -0700 spelling: primarily
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17507
spelling: primarily
Fri, 17 Aug 2012 13:58:18 -0700 spelling: prior
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17506
spelling: prior
Fri, 17 Aug 2012 13:58:18 -0700 spelling: precede
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17505
spelling: precede
Fri, 17 Aug 2012 13:58:18 -0700 spelling: override
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17504
spelling: override
Fri, 17 Aug 2012 13:58:18 -0700 spelling: operations
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17503
spelling: operations
Fri, 17 Aug 2012 13:58:18 -0700 spelling: multiple
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17502
spelling: multiple
Fri, 17 Aug 2012 13:58:18 -0700 spelling: Macintosh
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17501
spelling: Macintosh
Fri, 17 Aug 2012 13:58:18 -0700 en-us: labeled
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17500
en-us: labeled
Fri, 17 Aug 2012 13:58:18 -0700 spelling: just
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17499
spelling: just
Fri, 17 Aug 2012 13:58:18 -0700 spelling: journaling
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17498
spelling: journaling
Fri, 17 Aug 2012 13:58:18 -0700 spelling: deactivates
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17497
spelling: deactivates
Fri, 17 Aug 2012 13:58:18 -0700 spelling: implementing
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17496
spelling: implementing
Fri, 17 Aug 2012 13:58:18 -0700 spelling: indented
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17495
spelling: indented * * * spelling: indented
Fri, 17 Aug 2012 13:58:18 -0700 spelling: further
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17494
spelling: further
Fri, 17 Aug 2012 13:58:18 -0700 spelling: following
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 17493
spelling: following
(0) -10000 -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 +3000 +10000 +30000 tip