Wed, 15 Oct 2008 15:16:15 +0200 cross them fingahs
Peter Gervai <grin@grin.hu> [Wed, 15 Oct 2008 15:16:15 +0200] rev 495
cross them fingahs
Tue, 02 Sep 2008 08:48:48 -0400 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 02 Sep 2008 08:48:48 -0400] rev 494
Merge with stable
Tue, 02 Sep 2008 01:19:12 +0200 fix test output broken by a04d8cadb6af stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Sep 2008 01:19:12 +0200] rev 493
fix test output broken by a04d8cadb6af
Sun, 24 Aug 2008 23:44:52 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 23:44:52 +0200] rev 492
Merge with stable
Fri, 22 Aug 2008 22:32:53 +0200 Have verbose and debug flag print the changeset rev and hash when committing. stable
Gilles Moris <gilles.moris@free.fr> [Fri, 22 Aug 2008 22:32:53 +0200] rev 491
Have verbose and debug flag print the changeset rev and hash when committing. Besides updating the tests output, I had to push back at the end the test for issue1193 in test-commit, solved by cset 4386a7706828, because it was using the current date for commit and was randomizing the subsequent hash. [ original upstream description ]
Sun, 24 Aug 2008 22:13:39 +0200 Backed out changeset d557749c627a stable
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Aug 2008 22:13:39 +0200] rev 490
Backed out changeset d557749c627a Replace this change with a better one. [ original upstream description ]
Sun, 24 Aug 2008 20:13:45 +0200 (0.9.2compat) remove new verbose commit message for backwards compatibility 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 20:13:45 +0200] rev 489
(0.9.2compat) remove new verbose commit message for backwards compatibility
Sun, 24 Aug 2008 20:02:02 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 20:02:02 +0200] rev 488
(stable) merge with default
Fri, 22 Aug 2008 13:25:35 +0200 Have verbose flag print the changeset hash when committing stable
Gilles Moris <gilles.moris@free.fr> [Fri, 22 Aug 2008 13:25:35 +0200] rev 487
Have verbose flag print the changeset hash when committing [ original upstream message ]
Fri, 22 Aug 2008 11:53:30 +0200 (0.9.2compat) add merge, resolve to restricted 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Aug 2008 11:53:30 +0200] rev 486
(0.9.2compat) add merge, resolve to restricted This is not really backwards compatible (test only as comment) and doesn't prevent extra conflicts with older Hg versions. On the other hand it doesn't do any damage either and provides the 3-way merge ease if possible.
Fri, 22 Aug 2008 08:26:18 +0200 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Aug 2008 08:26:18 +0200] rev 485
Avoid additional conflicts during merge/resolve Make merge and resolve trigger kwtemplater.restricted to compare data without keyword expansion. The keyword stays outside the conflict: $Keyword$ <<<<<<< local bar ======= foo >>>>>>> other and will again be expanded on commit. Demonstrate in test case.
Thu, 21 Aug 2008 21:32:06 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 21:32:06 +0200] rev 484
(stable) merge with default
Thu, 21 Aug 2008 19:07:33 +0200 (0.9.2compat) fix test compatibility 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 19:07:33 +0200] rev 483
(0.9.2compat) fix test compatibility Comment out non-backwards compatible hgweb test (at default position). Make kwexpand nonexistent work on Windows (originally by pmezard).
Thu, 21 Aug 2008 10:20:44 +0200 Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 10:20:44 +0200] rev 482
Thorough hgweb testing - test hgweb while keyword extension is _enabled_ - check expansion with hgweb.file - besides log and diff, also check annotate for not expanding
Thu, 07 Aug 2008 11:20:34 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Aug 2008 11:20:34 +0200] rev 481
(stable) merge with default
(0) -300 -100 -15 +15 +100 +300 tip