Mercurial > hg > mutable-history
diff hgext/obsolete.py @ 420:b6163a85ddac
merge
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Sun, 05 Aug 2012 12:02:45 +0200 |
parents | 7d30d1becfc4 22f348c25d25 |
children | 8ae4f8bb24d5 |
line wrap: on
line diff
--- a/hgext/obsolete.py +++ b/hgext/obsolete.py @@ -35,11 +35,7 @@ New commands ------------ -Note that rebased changesets are not marked obsolete rather than being stripped -In this experimental extensions, this is done forcing the --keep option. Trying -to use the --keep option of rebase with this extensionn this experimental -extension will cause such a call to abort. Until better releasen please use -graft command to rebase and copy changesets. +Note that rebased changesets are now marked obsolete instead of being stripped. """ @@ -685,7 +681,7 @@ return if not util.safehasattr(repo.opener, 'tryread'): - raise util.Abort('Obsolete extension require Mercurial 2.2 (or later)') + raise util.Abort('Obsolete extension requires Mercurial 2.2 (or later)') opush = repo.push o_updatebranchcache = repo.updatebranchcache