Mon, 08 Jun 2009 18:14:44 -0500 merge: allow merging going backwards stable
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 571
merge: allow merging going backwards New behavior is generally superior and more correct, except possibly with regards to missing files. hg up . is now effectively a no-op, which is probably the desired behavior for people expecting to move to tip, but may surprise people who were expecting deleted files to reappear. case 1: update to . a-w -> a-w classic: ancestor a missing recreated right? rmed recreated WRONG added forgotten WRONG changed preserved RIGHT conflicted can't happen backward merge: ancestor a (NO EFFECT) missing missing wrong? rm'ed rm'ed RIGHT added preserved RIGHT changed preserved RIGHT conflicted can't happen case 2: update to ancestor of . a-b-w -> b-w \ a classic: ancestor a missing recreated right? rmed recreated wrong? added forgotten wrong? changed preserved RIGHT conflicted preserved wrong? backwards merge: ancestor b missing missing or conflict right? rm'ed missing or conflict right? changed preserved RIGHT conflicted merge RIGHT added preserved right? [ original upstream message ]
Sun, 07 Jun 2009 19:25:53 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:25:53 +0200] rev 570
(stable) merge
Sun, 07 Jun 2009 19:25:10 +0200 Remove doc string for standalone version
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:25:10 +0200] rev 569
Remove doc string for standalone version default and stable branches only for development and history.
Sun, 07 Jun 2009 19:23:23 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:23:23 +0200] rev 568
Merge with stable
Sun, 17 May 2009 01:24:45 +0200 tests: fix doc string in get-with-headers.py stable
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 01:24:45 +0200] rev 567
tests: fix doc string in get-with-headers.py [ original upstream message ]
Thu, 25 Dec 2008 17:49:08 +0100 test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py stable
Gilles Moris <gilles.moris@free.fr> [Thu, 25 Dec 2008 17:49:08 +0100] rev 566
test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py Note that other sed replacement commands are also filtering get-with-headers.py, but they seem to be more test specific, hence not handled here. [ original upstream message ]
Sun, 07 Jun 2009 19:18:59 +0200 (stable) merge for run-tests.py stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:18:59 +0200] rev 565
(stable) merge for run-tests.py
Sun, 07 Jun 2009 19:16:14 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:16:14 +0200] rev 564
Merge with stable
Sun, 07 Jun 2009 19:15:09 +0200 (stable) fix import gone wrong in 43d8c042ca20 stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:15:09 +0200] rev 563
(stable) fix import gone wrong in 43d8c042ca20
Sun, 07 Jun 2009 19:07:29 +0200 Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:07:29 +0200] rev 562
Add run-tests.py from main and update README
Sun, 07 Jun 2009 18:59:18 +0200 Refer users to distribution or 0.9.2compat branch
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 18:59:18 +0200] rev 561
Refer users to distribution or 0.9.2compat branch
Sun, 07 Jun 2009 18:51:53 +0200 (0.9.2compat) document Mercurial version range for standalone extension 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 18:51:53 +0200] rev 560
(0.9.2compat) document Mercurial version range for standalone extension
Sun, 07 Jun 2009 01:31:03 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 01:31:03 +0200] rev 559
Merge with stable
Fri, 19 Dec 2008 16:47:36 -0600 resolve: require -a switch to resolve all files stable
Matt Mackall <mpm@selenic.com> [Fri, 19 Dec 2008 16:47:36 -0600] rev 558
resolve: require -a switch to resolve all files Like revert -a, this should make this command slightly safer [ original upstream message ]
Thu, 04 Jun 2009 09:16:22 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Jun 2009 09:16:22 +0200] rev 557
Merge with stable
Mon, 01 Jun 2009 14:11:32 -0500 commit: drop the now-unused files parameter stable
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 14:11:32 -0500] rev 556
commit: drop the now-unused files parameter [ original upstream message ]
Mon, 01 Jun 2009 01:51:50 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 01 Jun 2009 01:51:50 +0200] rev 555
Merge with stable
Sun, 31 May 2009 14:55:51 +0200 fixed typos found in translatable strings stable
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 14:55:51 +0200] rev 554
fixed typos found in translatable strings This is from a spell-check of hg.pot. [ original upstream message ]
Wed, 27 May 2009 20:40:11 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 27 May 2009 20:40:11 +0200] rev 553
(stable) merge with default
Wed, 27 May 2009 20:34:38 +0200 keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net> [Wed, 27 May 2009 20:34:38 +0200] rev 552
keyword: rename matcher() to match() mimicking changes in main
Tue, 26 May 2009 18:24:06 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 26 May 2009 18:24:06 +0200] rev 551
Merge with stable
Sun, 24 May 2009 02:56:14 -0500 match: add some default args stable
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 550
match: add some default args [ original upstream message ]
Sun, 24 May 2009 02:56:14 -0500 match: change all users of util.matcher to match.match stable
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 549
match: change all users of util.matcher to match.match [ original upstream message ]
Mon, 25 May 2009 20:05:25 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 25 May 2009 20:05:25 +0200] rev 548
Merge with stable
Tue, 19 May 2009 03:59:58 +0200 update --clean: do not unlink added files (issue575) stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 19 May 2009 03:59:58 +0200] rev 547
update --clean: do not unlink added files (issue575) [ original upstream message ]
Tue, 19 May 2009 05:48:42 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 19 May 2009 05:48:42 +0200] rev 546
Merge with stable
Mon, 18 May 2009 17:36:24 -0500 commit: move editor outside transaction stable
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 17:36:24 -0500] rev 545
commit: move editor outside transaction The commit editor is now invoked before files and manifest are committed. The editor is now run with only the wlock held and aborting an edit no longer requires rolling back a transaction. Changes to files during a commit still result in undefined behavior. (This is preliminary work for committing subrepositories) [ original upstream message ]
Fri, 15 May 2009 01:37:50 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 15 May 2009 01:37:50 +0200] rev 544
Merge with stable
Thu, 14 May 2009 13:20:40 -0500 commit: move commit editor to cmdutil, pass as function stable
Matt Mackall <mpm@selenic.com> [Thu, 14 May 2009 13:20:40 -0500] rev 543
commit: move commit editor to cmdutil, pass as function [ original upstream message ]
Thu, 14 May 2009 13:20:40 -0500 commit: drop unused p1 and p2 args stable
Matt Mackall <mpm@selenic.com> [Thu, 14 May 2009 13:20:40 -0500] rev 542
commit: drop unused p1 and p2 args [ original upstream message ]
Tue, 28 Apr 2009 09:42:44 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 28 Apr 2009 09:42:44 +0100] rev 541
Merge with stable
Sun, 26 Apr 2009 01:08:54 +0200 updated license to be explicit about GPL version 2 stable
Martin Geisler <mg@lazybytes.net> [Sun, 26 Apr 2009 01:08:54 +0200] rev 540
updated license to be explicit about GPL version 2 [ original upstream message ]
Mon, 27 Apr 2009 18:35:45 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 27 Apr 2009 18:35:45 +0100] rev 539
Merge with stable
Sun, 26 Apr 2009 16:50:44 -0500 replace util.sort with sorted built-in stable
Matt Mackall <mpm@selenic.com> [Sun, 26 Apr 2009 16:50:44 -0500] rev 538
replace util.sort with sorted built-in This is marginally faster for small and moderately-sized lists [ original upstream message ]
Sun, 26 Apr 2009 15:04:03 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Apr 2009 15:04:03 +0100] rev 537
Merge with stable
Sun, 26 Apr 2009 14:29:02 +0200 tests: removed redundant "-d '0 0'" from test scripts stable
Martin Geisler <mg@lazybytes.net> [Sun, 26 Apr 2009 14:29:02 +0200] rev 536
tests: removed redundant "-d '0 0'" from test scripts The tests are executed with a .hgrc file which adds "-d '0 0'" by default. [ original upstream message ]
Wed, 22 Apr 2009 10:28:29 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Apr 2009 10:28:29 +0100] rev 535
Merge with stable
Wed, 22 Apr 2009 02:01:22 +0200 switch lock releasing in the extensions from gc to explicit stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Wed, 22 Apr 2009 02:01:22 +0200] rev 534
switch lock releasing in the extensions from gc to explicit [ original upstream message ]
Tue, 21 Apr 2009 11:37:50 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 21 Apr 2009 11:37:50 +0100] rev 533
Merge with stable
Tue, 21 Apr 2009 09:56:07 +0100 keyword: set overwrite message only once, not for each file stable
Christian Ebert <blacktrash@gmx.net> [Tue, 21 Apr 2009 09:56:07 +0100] rev 532
keyword: set overwrite message only once, not for each file [ original upstream message ]
Mon, 20 Apr 2009 21:16:13 -0300 keyword, i18n: avoid untranslated strings as message parameters stable
Wagner Bruna <wbruna@yahoo.com> [Mon, 20 Apr 2009 21:16:13 -0300] rev 531
keyword, i18n: avoid untranslated strings as message parameters [ original upstream message ]
Wed, 08 Apr 2009 23:13:51 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Apr 2009 23:13:51 +0200] rev 530
Merge with stable
Tue, 07 Apr 2009 22:58:05 +0200 expand "repo" to "repository" in help texts stable
Martin Geisler <mg@lazybytes.net> [Tue, 07 Apr 2009 22:58:05 +0200] rev 529
expand "repo" to "repository" in help texts [ original upstream message ]
Sun, 05 Apr 2009 12:15:32 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 05 Apr 2009 12:15:32 +0200] rev 528
Merge with stable
Sat, 04 Apr 2009 23:17:53 +0200 keyword: word-wrap help texts at 70 characters stable
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:17:53 +0200] rev 527
keyword: word-wrap help texts at 70 characters [ original upstream description ]
Wed, 18 Mar 2009 13:37:10 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Mar 2009 13:37:10 +0100] rev 526
Merge with stable
Tue, 17 Mar 2009 13:43:11 -0500 bundlerepo: reintroduce dirstate stable
Matt Mackall <mpm@selenic.com> [Tue, 17 Mar 2009 13:43:11 -0500] rev 525
bundlerepo: reintroduce dirstate [ original upstream description ]
Thu, 05 Mar 2009 06:47:41 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 05 Mar 2009 06:47:41 +0100] rev 524
Merge with stable
Sat, 14 Feb 2009 22:40:39 +0100 add --git option to commands supporting --patch (log, incoming, history, tip) stable
Jim Correia <jim.correia@pobox.com> [Sat, 14 Feb 2009 22:40:39 +0100] rev 523
add --git option to commands supporting --patch (log, incoming, history, tip) No short -g form, since it would conflict with -g from the graphlog extension. [ original upstream descrition]
Wed, 19 Nov 2008 13:27:57 +0100 patch: pass an opener to patchfile stable
Patrick Mezard <pmezard@gmail.com> [Wed, 19 Nov 2008 13:27:57 +0100] rev 522
patch: pass an opener to patchfile [ original upstream description ]
Wed, 04 Mar 2009 13:06:16 -0600 merge: better error messages to lead users to hg update --clean to abandon merges. stable
Augie Fackler <durin42@gmail.com> [Wed, 04 Mar 2009 13:06:16 -0600] rev 521
merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533. [ original upstream description ]
Sat, 03 Jan 2009 17:15:21 +0100 mq: lowercase output stable
Martin Geisler <mg@daimi.au.dk> [Sat, 03 Jan 2009 17:15:21 +0100] rev 520
mq: lowercase output This extension produces quite a lot of informational messages during its normal operation and it is hard to say which strings can be changed and which cannot. [ original upstream description ]
Wed, 17 Dec 2008 15:22:45 +0100 (0.9.2compat) do not use builtin format 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Dec 2008 15:22:45 +0100] rev 519
(0.9.2compat) do not use builtin format
Wed, 17 Dec 2008 14:55:20 +0100 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Dec 2008 14:55:20 +0100] rev 518
(stable) merge with default
Tue, 16 Dec 2008 09:58:41 +0100 keyword: simplify repo.local and bundle check (as in 2f4a399a8787)
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Dec 2008 09:58:41 +0100] rev 517
keyword: simplify repo.local and bundle check (as in 2f4a399a8787)
Fri, 05 Dec 2008 14:09:59 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Dec 2008 14:09:59 +0100] rev 516
Merge with stable
Sun, 28 Sep 2008 20:40:38 +0200 get-with-headers: fix stream modes under Windows stable
Patrick Mezard <pmezard@gmail.com> [Sun, 28 Sep 2008 20:40:38 +0200] rev 515
get-with-headers: fix stream modes under Windows [ original upstream descripton ]
Wed, 28 Nov 2007 08:38:42 -0800 hgweb: return meaningful HTTP status codes instead of nonsense stable
Bryan O'Sullivan <bos@serpentine.com> [Wed, 28 Nov 2007 08:38:42 -0800] rev 514
hgweb: return meaningful HTTP status codes instead of nonsense [ original upstream description ]
Thu, 29 Jun 2006 16:44:23 -0700 Add a test for getting raw files via the web UI. stable
Eric Hopper <hopper@omnifarious.org> [Thu, 29 Jun 2006 16:44:23 -0700] rev 513
Add a test for getting raw files via the web UI. [ original upstream description ]
Sun, 19 Oct 2008 12:23:58 +0200 hgweb: nodeids should be aligned in raw changesets stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Oct 2008 12:23:58 +0200] rev 512
hgweb: nodeids should be aligned in raw changesets If they aren't it breaks hg import --exact Thanks to Jesper Noehr for noticing it. [ original upstream description ]
Sat, 12 Jul 2008 19:12:18 +0100 notify: mime-encode messages stable
Christian Ebert <blacktrash@gmx.net> [Sat, 12 Jul 2008 19:12:18 +0100] rev 511
notify: mime-encode messages - addresses will be properly encoded - message bodies will also be encoded as we are not sending patches that are meant to be applied - update test output - adapt test-keyword to ignore the new headers [ original upstream description ]
Wed, 26 Nov 2008 09:35:38 +0100 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 26 Nov 2008 09:35:38 +0100] rev 510
(stable) merge with default
Tue, 25 Nov 2008 18:13:05 +0100 Do not shadow builtin format (detected by pychecker)
Christian Ebert <blacktrash@gmx.net> [Tue, 25 Nov 2008 18:13:05 +0100] rev 509
Do not shadow builtin format (detected by pychecker)
Tue, 25 Nov 2008 18:13:54 +0100 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Tue, 25 Nov 2008 18:13:54 +0100] rev 508
(stable) merge with default
(0) -300 -100 -64 +64 +100 +300 tip