Sat, 25 Jun 2011 01:55:13 +0200 tests: HGRCPATH must be exported after assignment stable
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
Fri, 24 Jun 2011 18:00:29 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 24 Jun 2011 18:00:29 -0500] rev 14733
merge with stable
Fri, 24 Jun 2011 23:25:42 +0300 backout of d04ba50e104d: allow to qpop/push with a dirty working copy 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.
Fri, 24 Jun 2011 13:35:44 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 24 Jun 2011 13:35:44 -0500] rev 14731
merge with stable
Fri, 24 Jun 2011 13:35:03 -0500 merge with stable stable
Matt Mackall <mpm@selenic.com> [Fri, 24 Jun 2011 13:35:03 -0500] rev 14730
merge with stable
Fri, 24 Jun 2011 10:31:44 +0200 update: do not use the term 'update' when mentioning reverting one file 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.
Fri, 24 Jun 2011 16:36:24 +0300 cmdserver: fix read-loop string concatenation stable
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 16:36:24 +0300] rev 14728
cmdserver: fix read-loop string concatenation
Fri, 24 Jun 2011 16:30:43 +0300 dispatch: check for None before closing repo stable
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.
Fri, 24 Jun 2011 12:37:29 +0200 revert: mention update in hint of abort when reverting to non-parent stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 24 Jun 2011 12:37:29 +0200] rev 14726
revert: mention update in hint of abort when reverting to non-parent and explicitly warn about uncommitted changes Examples: BEFORE: $ hg par -q 7:e81a2efd53d4 $ hg revert -r 2 abort: no files or directories specified (use --all to discard all changes) AFTER: Clean working directory (revert can be easily undone, no edits to be lost): $ hg revert -r 2 abort: no files or directories specified (use --all to revert all files, or 'hg update 2' to update) Uncommitted changes (revert --all *does* discard edits and is pretty hard to undo or even impossible if --no-backup is specified): $ hg revert -r 2 abort: no files or directories specified (uncommitted changes, use --all to discard all changes, or 'hg update 2' to update)
Fri, 24 Jun 2011 10:51:05 +0200 update: clarify that update changes the parent revison stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 24 Jun 2011 10:51:05 +0200] rev 14725
update: clarify that update changes the parent revison
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip