Sat, 15 Oct 2011 14:30:50 -0500 merge default into stable for 2.0 code freeze stable 2.0-rc
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 14:30:50 -0500] rev 15273
merge default into stable for 2.0 code freeze
Sat, 15 Oct 2011 14:19:24 -0500 rebase: simplify check for orphaned descendants
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 14:19:24 -0500] rev 15272
rebase: simplify check for orphaned descendants
Sat, 15 Oct 2011 14:19:07 -0500 rebase: simplify set generation
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 14:19:07 -0500] rev 15271
rebase: simplify set generation
Sat, 15 Oct 2011 20:12:32 +0200 rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 15 Oct 2011 20:12:32 +0200] rev 15270
rebase: add --rev option to rebase This option allow a strict set of revision to be specified instead of using -s or -b. Rebase will refuse start if striping rebased changeset will strip non rebased changeset. Rebase will refuse to work on set with multiple root.
Sat, 15 Oct 2011 12:57:47 -0500 rebase: allow revsets for source and base args
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 12:57:47 -0500] rev 15269
rebase: allow revsets for source and base args
Sat, 15 Oct 2011 12:52:43 -0500 revset: fix %r handling in formatspec
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 12:52:43 -0500] rev 15268
revset: fix %r handling in formatspec
Sat, 15 Oct 2011 19:07:51 +0200 rebase: use revset as soon as possible in internal logic
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 15 Oct 2011 19:07:51 +0200] rev 15267
rebase: use revset as soon as possible in internal logic The buildstate function now take a set of revs. Logic related to --source and --base option have been moved in the main rebase function. In the process this fixes a bug where the wrong source changeset might be pick. This explain the changes in hgext/rebase.py
Sat, 15 Oct 2011 10:20:08 -0500 revset: add %r for embedded revset support to formatspec
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 10:20:08 -0500] rev 15266
revset: add %r for embedded revset support to formatspec This allows folding external revsets or lists of revsets into a revset expression. Revsets are pre-parsed for validity so that syntax errors don't escape.
Sat, 15 Oct 2011 01:06:52 +0200 revert: warn that subrepos cannot be reverted
Angel Ezquerra <angel.ezquerra@gmail.com> [Sat, 15 Oct 2011 01:06:52 +0200] rev 15265
revert: warn that subrepos cannot be reverted (tests added by mpm)
Wed, 12 Oct 2011 21:45:58 -0400 merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca> [Wed, 12 Oct 2011 21:45:58 -0400] rev 15264
merge: expand environment variables and ~/ in tool.executable hgrc(5) already implies that this works, so we might as well support it. Another approach would be to implement this in util.findexe(): that would benefit other callers of findexe(), e.g. convert and anyone calling the user's editor. But findexe() is really implemented in both posix.py and windows.py, so this would make both of those modules depend on util.py: not good. So keep it narrow and only for merge tools.
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip