Wed, 18 Aug 2010 05:55:56 +0530 tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com> [Wed, 18 Aug 2010 05:55:56 +0530] rev 11981
tests: unify test-merge8
Wed, 18 Aug 2010 05:54:00 +0530 tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com> [Wed, 18 Aug 2010 05:54:00 +0530] rev 11980
tests: unify test-merge7
Wed, 18 Aug 2010 05:21:07 +0530 tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com> [Wed, 18 Aug 2010 05:21:07 +0530] rev 11979
tests: unify test-merge6
Wed, 18 Aug 2010 05:15:49 +0530 tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com> [Wed, 18 Aug 2010 05:15:49 +0530] rev 11978
tests: unify test-merge5
Wed, 18 Aug 2010 05:12:44 +0530 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com> [Wed, 18 Aug 2010 05:12:44 +0530] rev 11977
tests: unify test-merge4
Wed, 18 Aug 2010 05:09:58 +0530 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com> [Wed, 18 Aug 2010 05:09:58 +0530] rev 11976
tests: unify test-merge2
Wed, 18 Aug 2010 05:05:51 +0530 tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com> [Wed, 18 Aug 2010 05:05:51 +0530] rev 11975
tests: unify test-merge1
Wed, 18 Aug 2010 04:37:06 +0530 tests: unify test-excessive-merge
Pradeepkumar Gayam <in3xes@gmail.com> [Wed, 18 Aug 2010 04:37:06 +0530] rev 11974
tests: unify test-excessive-merge
Wed, 18 Aug 2010 04:30:27 +0530 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com> [Wed, 18 Aug 2010 04:30:27 +0530] rev 11973
tests: unify test-double-merge
Wed, 18 Aug 2010 04:26:20 +0530 tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com> [Wed, 18 Aug 2010 04:26:20 +0530] rev 11972
tests: unify test-copy-move-merge
Wed, 18 Aug 2010 04:21:10 +0530 tests: unify test-merge-closedheads
Pradeepkumar Gayam <in3xes@gmail.com> [Wed, 18 Aug 2010 04:21:10 +0530] rev 11971
tests: unify test-merge-closedheads
Thu, 19 Aug 2010 10:25:41 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 19 Aug 2010 10:25:41 -0500] rev 11970
merge with stable
Wed, 28 Jul 2010 23:05:03 -0600 color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com> [Wed, 28 Jul 2010 23:05:03 -0600] rev 11969
color: enable branches support This commit updates the branches command to use ui.label for the branch names and the changeset. This implementation allows assigning colors to the four states of a branch: active, closed, current and inactive. While you can configure color for the four states, only current and closed have default colors of green and black bold respectively.
Wed, 18 Aug 2010 23:37:26 +0200 mq/qqueue: update bash completion
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> [Wed, 18 Aug 2010 23:37:26 +0200] rev 11968
mq/qqueue: update bash completion
Wed, 18 Aug 2010 23:37:19 +0200 mq/qqueue: add --purge option to delete a queue and its patch dir
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> [Wed, 18 Aug 2010 23:37:19 +0200] rev 11967
mq/qqueue: add --purge option to delete a queue and its patch dir qqueue --delete only deletes the reference to the queue, and leaves the associated patch directory behind. There is no Mercurial-way of getting rid of that patch directory afterward. This patch adds the --purge option to qqueue, that deletes the queue from the list, and also removes the associated patch dir. If the queue was non-existant, but the patch dir was, it is removed nonetheless. This is to avoid manual intervention in the .hg directory.
Wed, 18 Aug 2010 23:34:28 +0200 mq/qqueue: commonalise the queue deletion code
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> [Wed, 18 Aug 2010 23:34:28 +0200] rev 11966
mq/qqueue: commonalise the queue deletion code
Wed, 18 Aug 2010 02:43:45 +0200 mq: don't inherit default and default-push paths with --mq (issue2333) stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 18 Aug 2010 02:43:45 +0200] rev 11965
mq: don't inherit default and default-push paths with --mq (issue2333) Configuration from the outer repo is inherited to the patches repo when --mq is used. In case the patches repo only has paths.default configured but the outer repo has paths.default-push then the inherited default-push will win. Very confusing. Inheriting the default paths is however wrong in all sane cases, so now we explicitly remove them.
Thu, 19 Aug 2010 16:34:12 +0200 test-subrepo-paths: use printf instead of echo
Martin Geisler <mg@lazybytes.net> [Thu, 19 Aug 2010 16:34:12 +0200] rev 11964
test-subrepo-paths: use printf instead of echo Different shells have different opinions on how to backslashes must be escaped for echo, but printf is consistent across zsh, dash, bash, tcsh, and csh.
Wed, 18 Aug 2010 19:37:23 +0200 parendelta: fix computation of base rev (fixes issue2337)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 18 Aug 2010 19:37:23 +0200] rev 11963
parendelta: fix computation of base rev (fixes issue2337) Refactor revlog._addrevision() and put the correct base rev in the parent-delta case: base(rev) should always be equal to the first full snapshot that is needed by the delta chain, in both parent-delta and tip-delta case. Before this fix, the base rev was in most case wrong (and in the case where p1 == nullid, this triggered the bug from issue2337). This means that repositories converted to parent-delta earlier are corrupted and needs to be reconverted.
Wed, 18 Aug 2010 19:45:52 +0200 revlog._addrevision(): make the parent of the cached delta explicit
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 18 Aug 2010 19:45:52 +0200] rev 11962
revlog._addrevision(): make the parent of the cached delta explicit
Thu, 19 Aug 2010 13:25:46 +0200 subrepos: handle backslashes in subpaths
Martin Geisler <mg@lazybytes.net> [Thu, 19 Aug 2010 13:25:46 +0200] rev 11961
subrepos: handle backslashes in subpaths
Thu, 19 Aug 2010 10:59:37 +0200 help: document stringify templatefilter stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 19 Aug 2010 10:59:37 +0200] rev 11960
help: document stringify templatefilter
Wed, 18 Aug 2010 11:59:35 +0200 test-subrepo-paths: moved comment lines to where they belong
Martin Geisler <mg@lazybytes.net> [Wed, 18 Aug 2010 11:59:35 +0200] rev 11959
test-subrepo-paths: moved comment lines to where they belong
Tue, 17 Aug 2010 17:44:19 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 17 Aug 2010 17:44:19 -0500] rev 11958
merge with stable
Tue, 17 Aug 2010 17:41:20 -0500 merge with i18n
Matt Mackall <mpm@selenic.com> [Tue, 17 Aug 2010 17:41:20 -0500] rev 11957
merge with i18n
Tue, 17 Aug 2010 17:40:53 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Tue, 17 Aug 2010 17:40:53 -0500] rev 11956
merge with i18n
Tue, 17 Aug 2010 12:02:34 -0300 i18n-pt_BR: fix typo in commit help text stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 17 Aug 2010 12:02:34 -0300] rev 11955
i18n-pt_BR: fix typo in commit help text spotted by Fred Maranhão
Mon, 16 Aug 2010 16:10:30 -0300 i18n: merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 16 Aug 2010 16:10:30 -0300] rev 11954
i18n: merge with stable
Mon, 16 Aug 2010 16:06:10 -0300 i18n-pt_BR: synchronized with 2da0cf99b642 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 16 Aug 2010 16:06:10 -0300] rev 11953
i18n-pt_BR: synchronized with 2da0cf99b642
Mon, 16 Aug 2010 15:46:00 -0300 i18n-pt_BR: fix typo stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 16 Aug 2010 15:46:00 -0300] rev 11952
i18n-pt_BR: fix typo
(0) -10000 -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 +10000 +30000 tip