Mercurial Mercurial > hg > mercurial-server / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge default debian
authorPaul Crowley <paul@lshift.net>
Tue, 06 Sep 2011 11:41:10 +0100
branchdebian
changeset 317 aaad8e1e2f4e
parent 314 c02eae7665af (current diff)
parent 316 afa6673dfb63 (diff)
child 318 5259bc023d36
Merge default
.hgtags file | annotate | diff | comparison | revisions 
--- a/.hgtags	Tue Sep 06 11:18:18 2011 +0100
+++ b/.hgtags	Tue Sep 06 11:41:10 2011 +0100
@@ -12,3 +12,4 @@
 c7aca86585824f39fa47015d6ebf1bab6a25b82c debian_1.0.1-1
 01eca64f77abbf0da41cd777a365de2a5a02988b release_1.1
 32dba1a70a5443cf86a78b5a9471ad7ced034a12 debian_1.1-1
+30d35aed0ae264836384a151d549aaffd9c02abd release_1.2
--- a/NEWS	Tue Sep 06 11:18:18 2011 +0100
+++ b/NEWS	Tue Sep 06 11:41:10 2011 +0100
@@ -1,6 +1,19 @@
-======================
+====================
+mercurial-server 1.2
+====================
+
+* Fix error in security code ruleset.py
+* Mercurial 1.9 compatibility
+* Compatibility with older versions of Python
+* Allow MQ repositories to be pushed/pulled
+* Testing and whitespace fixes
+
+Upgrading: if you need MQ compatibility, copy in the "[exceptions]" stanza
+from the default dot-mercurial-server file.
+
+====================
 mercurial-server 1.1
-======================
+====================
 
 * Allow subrepo creation
 * New log filename
mercurial-server