Thu, 23 Apr 2015 09:03:08 -0400 docs: remove unused/obsolete figures stable
Greg Ward <greg@gerg.ca> [Thu, 23 Apr 2015 09:03:08 -0400] rev 1286
docs: remove unused/obsolete figures
Thu, 23 Apr 2015 21:08:33 -0400 docs: remove obsolete documentation stable
Greg Ward <greg@gerg.ca> [Thu, 23 Apr 2015 21:08:33 -0400] rev 1285
docs: remove obsolete documentation evolve-collaboration.rst replaced by sharing.rst instability.rst introduction to the concept for Mercurial developers -- no longer needed since most are now convinced obs-concept.rst largely replaced by the user guide obs-implementation.rst more for Mercurial developers; the source code is probably more accurate and up-to-date qsync.rst the extension this referred to no longer exists This fixes several more sphinx warnings. I've left some other old docs around, because they still have useful content that needs to be adapted and updated.
Thu, 23 Apr 2015 08:35:38 -0400 docs: add a table of contents stable
Greg Ward <greg@gerg.ca> [Thu, 23 Apr 2015 08:35:38 -0400] rev 1284
docs: add a table of contents This silences many sphinx warnings about documents not included in any toctree. Still need to delete obsolete .rst files to silence the rest of the warnings.
Thu, 23 Apr 2015 03:18:30 +0200 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 23 Apr 2015 03:18:30 +0200] rev 1283
merge with stable
Thu, 23 Apr 2015 03:15:38 +0200 Added tag 5.1.4 for changeset 891c3ce894fa stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 23 Apr 2015 03:15:38 +0200] rev 1282
Added tag 5.1.4 for changeset 891c3ce894fa
Thu, 23 Apr 2015 03:15:20 +0200 prepare release 5.1.4 stable 5.1.4
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 23 Apr 2015 03:15:20 +0200] rev 1281
prepare release 5.1.4
Thu, 23 Apr 2015 03:10:11 +0200 evolve: drop unused 'urllib' import stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 23 Apr 2015 03:10:11 +0200] rev 1280
evolve: drop unused 'urllib' import
Wed, 22 Apr 2015 14:30:23 +0200 debugobsrelsethashtree: get the command to work again stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Apr 2015 14:30:23 +0200] rev 1279
debugobsrelsethashtree: get the command to work again The command was untested and became broken when we introduced the new discovery hashing.
Tue, 21 Apr 2015 16:52:08 +0200 getbundleobsmarker: prevent crash from filtered content (issue4616) stable
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 21 Apr 2015 16:52:08 +0200] rev 1278
getbundleobsmarker: prevent crash from filtered content (issue4616) The discovery may discover common markers on non-served nodes. This lead to crash when building the obsmarker part.
Tue, 21 Apr 2015 17:37:19 +0200 test-wireproto: add some obsmarker discovery usage. stable
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 21 Apr 2015 17:37:19 +0200] rev 1277
test-wireproto: add some obsmarker discovery usage. The old code was never checking that the discovery were skipping common markers. This is now done.
Tue, 21 Apr 2015 17:37:59 +0200 test-wireprotocol: test with both bundle1 and bundle2 stable
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 21 Apr 2015 17:37:59 +0200] rev 1276
test-wireprotocol: test with both bundle1 and bundle2 Bundle two is becoming the major way of exchanging things now. We duplicate the test and ensure the default version runs using bundle2.
Mon, 20 Apr 2015 14:45:50 +0200 Update debian packaging for 5.1.3 stable
Julien Cristau <julien.cristau@logilab.fr> [Mon, 20 Apr 2015 14:45:50 +0200] rev 1275
Update debian packaging for 5.1.3
Wed, 19 Nov 2014 01:04:44 +0000 Update debian packaging for 5.0.0 stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 19 Nov 2014 01:04:44 +0000] rev 1274
Update debian packaging for 5.0.0
Sat, 11 Apr 2015 10:15:16 -0400 create 3.1 compatibility branch mercurial-3.1
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 11 Apr 2015 10:15:16 -0400] rev 1273
create 3.1 compatibility branch The next changeset drop 3.1 compatibility.
Mon, 20 Apr 2015 14:21:38 +0200 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 20 Apr 2015 14:21:38 +0200] rev 1272
merge with stable
Mon, 20 Apr 2015 14:20:03 +0200 Add "documentation update" to the changelog. stable
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 20 Apr 2015 14:20:03 +0200] rev 1271
Add "documentation update" to the changelog.
Tue, 14 Apr 2015 12:01:05 -0400 docs: cover 'touch' command stable
Greg Ward <greg@gerg.ca> [Tue, 14 Apr 2015 12:01:05 -0400] rev 1270
docs: cover 'touch' command
Mon, 13 Apr 2015 15:18:01 -0400 docs: explain that obsolete is not hidden stable
Greg Ward <greg@gerg.ca> [Mon, 13 Apr 2015 15:18:01 -0400] rev 1269
docs: explain that obsolete is not hidden
Mon, 13 Apr 2015 15:09:55 -0400 docs: explain --hidden option stable
Greg Ward <greg@gerg.ca> [Mon, 13 Apr 2015 15:09:55 -0400] rev 1268
docs: explain --hidden option Also move the discussion of revision numbers up, and splice the explanation of --hidden into it.
Mon, 13 Apr 2015 15:42:42 -0400 docs: tweak wording, punctuation for better readability stable
Greg Ward <greg@gerg.ca> [Mon, 13 Apr 2015 15:42:42 -0400] rev 1267
docs: tweak wording, punctuation for better readability
Mon, 13 Apr 2015 15:00:05 -0400 docs: flesh out unfinished bits in the intro page stable
Greg Ward <greg@gerg.ca> [Mon, 13 Apr 2015 15:00:05 -0400] rev 1266
docs: flesh out unfinished bits in the intro page
Tue, 14 Apr 2015 12:58:13 -0400 docs: revive the explanation of divergent changesets in the sharing guide stable
Greg Ward <greg@gerg.ca> [Tue, 14 Apr 2015 12:58:13 -0400] rev 1265
docs: revive the explanation of divergent changesets in the sharing guide
Fri, 20 Jun 2014 08:19:04 -0400 docs (sharing): more scattered wording tweaks stable
Greg Ward <greg@gerg.ca> [Fri, 20 Jun 2014 08:19:04 -0400] rev 1264
docs (sharing): more scattered wording tweaks
Tue, 14 Apr 2015 12:55:04 -0400 docs: sharing guide: clarify end-game of "Example 2" stable
Greg Ward <greg@gerg.ca> [Tue, 14 Apr 2015 12:55:04 -0400] rev 1263
docs: sharing guide: clarify end-game of "Example 2" - push to dev-repo, rather than pulling into it (consistent with how we work the multiple developer scenario later) - explicitly demonstrate that public changesets are immutable
Sun, 15 Jun 2014 21:17:09 -0400 docs: minor tweaks to sharing guide (suggested by timeless) stable
Greg Ward <greg@gerg.ca> [Sun, 15 Jun 2014 21:17:09 -0400] rev 1262
docs: minor tweaks to sharing guide (suggested by timeless)
Tue, 14 Apr 2015 12:53:12 -0400 docs: add code review scenario to sharing guide stable
Greg Ward <greg@gerg.ca> [Tue, 14 Apr 2015 12:53:12 -0400] rev 1261
docs: add code review scenario to sharing guide The idea is to demonstrate a simpler multiple-developer situation that does not involve getting into trouble. The final scenario illustrates Alice and Bob getting into trouble with bumped and divergent changesets by amending each other's history. The required tests and text are all written, but will need to be heavily revised because of the inserted scenario.
Mon, 09 Jun 2014 08:18:43 -0400 docs: add a bit more hierarchy to the sharing guide stable
Greg Ward <greg@gerg.ca> [Mon, 09 Jun 2014 08:18:43 -0400] rev 1260
docs: add a bit more hierarchy to the sharing guide
Tue, 14 Apr 2015 12:43:37 -0400 docs: update sharing guide based (mostly) on marmoute's review stable
Greg Ward <greg@gerg.ca> [Tue, 14 Apr 2015 12:43:37 -0400] rev 1259
docs: update sharing guide based (mostly) on marmoute's review - don't claim certain scenarios are more/less common, just simple/advanced - mention code review as a multiple-developer scenario (not described in detail yet!) - suggest "hg config --edit --local" instead of "cat >> .hg/hgrc" - use -q less often (and show resulting output) - edit some section headers to be consistent with user guide (example numbers; "amend" instead of "amending") (These are just the small changes; big changes are yet to come.)
Mon, 20 Apr 2015 13:52:43 +0200 Added tag 5.1.3 for changeset c52c15100fb2 stable
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 20 Apr 2015 13:52:43 +0200] rev 1258
Added tag 5.1.3 for changeset c52c15100fb2
Mon, 20 Apr 2015 13:52:17 +0200 prepare version 5.1.3 stable 5.1.3
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 20 Apr 2015 13:52:17 +0200] rev 1257
prepare version 5.1.3
(0) -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 tip