Steve Borho <steve@borho.org> [Fri, 09 Apr 2010 17:23:37 -0500] rev 10882
rollback: add dry-run argument, emit transaction description
Steve Borho <steve@borho.org> [Fri, 09 Apr 2010 17:23:35 -0500] rev 10881
localrepo: add desc parameter to transaction
All callers to localrepo.transaction() must supply a transaction description.
The description and the existing repository tip are then stored
(transactionally) into .hg/undo.desc; where rollback can later find it.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Apr 2010 15:16:52 +0200] rev 10880
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Apr 2010 15:16:31 +0200] rev 10879
merge default
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Apr 2010 15:14:43 +0200] rev 10878
test-hgwebdir: correctly include '-' in sed expression.
'\' can't be used to escape '-' from being interpreted as a range,
so put it at the end.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 08 Apr 2010 17:21:42 +0200] rev 10877
localrepo: refactor prepush logic
Simplifies the prepush check logic and makes it a lot more direct and
comprehensible. Instead of comparing the total local vs. remote head count, it
compares the number of new vs. removed heads.
Sune Foldager <cryo@cyanite.org> [Fri, 09 Apr 2010 10:35:53 +0200] rev 10876
merge with stable
Sune Foldager <cryo@cyanite.org> [Thu, 08 Apr 2010 19:46:47 +0200] rev 10875
partial backout of 1e819576e926 and add tests (issue2131)
The tests are due to Peter Arrenbrecht
Henrik Stuart <henrik.stuart@edlund.dk> [Wed, 07 Apr 2010 21:31:47 +0200] rev 10874
copies: properly visit file context ancestors on working file contexts
Matt Mackall <mpm@selenic.com> [Wed, 07 Apr 2010 14:44:51 -0500] rev 10873
Merge with stable