Mads Kiilerich <mads@kiilerich.com> [Sat, 25 Jun 2011 01:55:16 +0200] rev 14736
tests: solaris [ doesn't know -e
Mads Kiilerich <mads@kiilerich.com> [Sat, 25 Jun 2011 01:55:15 +0200] rev 14735
convert: fix git convert on solaris - it cannot remove environment variables
Mads Kiilerich <mads@kiilerich.com> [Sat, 25 Jun 2011 01:55:13 +0200] rev 14734
tests: HGRCPATH must be exported after assignment
- at least on Solaris
Matt Mackall <mpm@selenic.com> [Fri, 24 Jun 2011 18:00:29 -0500] rev 14733
merge with stable
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 23:25:42 +0300] rev 14732
backout of d04ba50e104d: allow to qpop/push with a dirty working copy
The new behavior was breaking existing tools that relied on a sequence such as
this:
1) start with a dirty working copy
2) qimport some patch
3) try to qpush it
4) old behavior would fail at this point due to outstanding changes.
(new behavior would only fail if the outstanding changes and the patches
changes intersect)
5) innocent user qrefreshes, gets his local changes in the imported patch
It's worth considering if we can move this behavior to -f in the future.
Matt Mackall <mpm@selenic.com> [Fri, 24 Jun 2011 13:35:44 -0500] rev 14731
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 24 Jun 2011 13:35:03 -0500] rev 14730
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 24 Jun 2011 10:31:44 +0200] rev 14729
update: do not use the term 'update' when mentioning reverting one file
and give a more precise hint for how to revert such a file
I'm using the term 'revision' instead of 'changeset' in this change to be
consistent with the REV we use in the synopsis.
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 16:36:24 +0300] rev 14728
cmdserver: fix read-loop string concatenation
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 16:30:43 +0300] rev 14727
dispatch: check for None before closing repo
We were trying to call close() if repo == None and req.repo != None.
This can happen when running commands that don't take a repo.