mercurial at 13558: 22 new changesets (12 stable)

Mercurial Commits hg at intevation.org
Mon Mar 7 15:55:11 CST 2011


22 new changesets (12 stable) in mercurial:

http://selenic.com/repo/hg//rev/37f487b9fbcc
changeset:   13537:37f487b9fbcc
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Mar 06 10:06:09 2011 +0100
summary:     test-rename-merge1: make it easier to review, windows friendly

http://selenic.com/repo/hg//rev/d24e97fd52a9
changeset:   13538:d24e97fd52a9
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Mar 06 14:17:47 2011 +0100
summary:     test-doctest: handle unix/windows path discrepancies

http://selenic.com/repo/hg//rev/b3330b8e1e6f
changeset:   13539:b3330b8e1e6f
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Mar 06 14:19:57 2011 +0100
summary:     run-tests: handle mixed comment lines in blacklists

http://selenic.com/repo/hg//rev/3ecadce9173d
changeset:   13540:3ecadce9173d
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Mar 06 14:38:47 2011 +0100
summary:     tests: convert test-serve to new format

http://selenic.com/repo/hg//rev/919174c0aaff
changeset:   13541:919174c0aaff
branch:      stable
parent:      13534:4ec34de8bbb1
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Mar 06 15:21:50 2011 +0100
summary:     Improve unresolved merge conflicts warning (issue2681)

http://selenic.com/repo/hg//rev/6e3bf361f70c
changeset:   13542:6e3bf361f70c
parent:      13540:3ecadce9173d
parent:      13541:919174c0aaff
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Mar 06 15:30:39 2011 +0100
summary:     Merge with stable

http://selenic.com/repo/hg//rev/c17e4d881722
changeset:   13543:c17e4d881722
branch:      stable
parent:      13541:919174c0aaff
user:        timeless <timeless at gmail.com>
date:        Sun Mar 06 05:56:59 2011 -0600
summary:     tests: improve hghave error reporting for missing Py OpenSSL

http://selenic.com/repo/hg//rev/66d65bccbf06
changeset:   13544:66d65bccbf06
branch:      stable
user:        timeless <timeless at gmail.com>
date:        Sun Mar 06 10:27:07 2011 -0600
summary:     cacert: improve error report when web.cacert file does not exist

http://selenic.com/repo/hg//rev/0549cbfd1d3d
changeset:   13545:0549cbfd1d3d
parent:      13542:6e3bf361f70c
parent:      13544:66d65bccbf06
user:        Mads Kiilerich <mads at kiilerich.com>
date:        Sun Mar 06 19:38:00 2011 +0100
summary:     merge with stable

http://selenic.com/repo/hg//rev/f3c2261023e5
changeset:   13546:f3c2261023e5
branch:      stable
parent:      13544:66d65bccbf06
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Mar 06 22:03:18 2011 +0100
summary:     hgweb: use tip in gitweb/monoblue filelog rss links (issue2677)

http://selenic.com/repo/hg//rev/a2dc8819bb0d
changeset:   13547:a2dc8819bb0d
branch:      stable
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Mar 06 22:03:30 2011 +0100
summary:     hgweb: fix filelog rss links generation

http://selenic.com/repo/hg//rev/c2eda93961ec
changeset:   13548:c2eda93961ec
parent:      13545:0549cbfd1d3d
parent:      13547:a2dc8819bb0d
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Mar 06 22:13:36 2011 +0100
summary:     merge with stable

http://selenic.com/repo/hg//rev/6217040b2780
changeset:   13549:6217040b2780
branch:      stable
parent:      13547:a2dc8819bb0d
user:        Matt Mackall <mpm at selenic.com>
date:        Sat Mar 05 16:34:59 2011 -0600
summary:     merge: drop resolve state for mergers with identical contents (issue2680)

http://selenic.com/repo/hg//rev/1792b8a9422b
changeset:   13550:1792b8a9422b
branch:      stable
user:        Matt Mackall <mpm at selenic.com>
date:        Mon Mar 07 15:03:10 2011 -0600
summary:     merge: back out single-parent fast-forward merge

http://selenic.com/repo/hg//rev/bbfae32f178e
changeset:   13551:bbfae32f178e
branch:      stable
user:        Georg Brandl <georg at python.org>
date:        Sun Mar 06 11:30:57 2011 +0100
summary:     hgcia: accept "queued." xmlrpc return as success

http://selenic.com/repo/hg//rev/7ab85fec60c3
changeset:   13552:7ab85fec60c3
branch:      stable
user:        Matt Mackall <mpm at selenic.com>
date:        Mon Mar 07 15:44:43 2011 -0600
summary:     ancestor: rewrite to deal with crossed linkrevs (issue2682)

http://selenic.com/repo/hg//rev/dea6efdd7ec4
changeset:   13553:dea6efdd7ec4
branch:      stable
user:        Eric Eisner <ede at mit.edu>
date:        Mon Mar 07 12:03:54 2011 -0500
summary:     subrepo: don't crash when git repo is missing

http://selenic.com/repo/hg//rev/22565ddb28e7
changeset:   13554:22565ddb28e7
parent:      13548:c2eda93961ec
user:        Matt Mackall <mpm at selenic.com>
date:        Mon Mar 07 15:45:10 2011 -0600
summary:     ancestor: improve description

http://selenic.com/repo/hg//rev/970150ddaaf8
changeset:   13555:970150ddaaf8
user:        Steven Brown <StevenGBrown at gmail.com>
date:        Mon Mar 07 15:37:11 2011 +0800
summary:     httprepo: order URL query string fields for readability

http://selenic.com/repo/hg//rev/2cefee00a5b9
changeset:   13556:2cefee00a5b9
branch:      stable
parent:      13517:da192c62f89e
user:        David Soria Parra <dsp at php.net>
date:        Sun Mar 06 15:32:37 2011 +0100
summary:     i18n-de: improve translation for "unmerged branches"

http://selenic.com/repo/hg//rev/7509e36eed3b
changeset:   13557:7509e36eed3b
branch:      stable
parent:      13553:dea6efdd7ec4
parent:      13556:2cefee00a5b9
user:        Matt Mackall <mpm at selenic.com>
date:        Mon Mar 07 15:46:28 2011 -0600
summary:     merge with i18n

http://selenic.com/repo/hg//rev/f854b775c386
changeset:   13558:f854b775c386
tag:         tip
parent:      13555:970150ddaaf8
parent:      13557:7509e36eed3b
user:        Matt Mackall <mpm at selenic.com>
date:        Mon Mar 07 15:46:46 2011 -0600
summary:     merge with stable

-- 
Repository URL: http://selenic.com/repo/hg/


More information about the Mercurial-devel mailing list