tests/test-githelp.t
changeset 38155 26b73fad45d9
parent 35721 f50067fbeead
child 38163 a40cc6d7d8c3
equal deleted inserted replaced
38154:10befe8e8b59 38155:26b73fad45d9
   163   hg update .^
   163   hg update .^
   164   $ hg githelp -- reset HEAD~3
   164   $ hg githelp -- reset HEAD~3
   165   hg update .~3
   165   hg update .~3
   166 
   166 
   167   $ hg githelp -- reset --mixed HEAD
   167   $ hg githelp -- reset --mixed HEAD
   168   NOTE: --mixed has no meaning since Mercurial has no staging area
   168   note: --mixed has no meaning since Mercurial has no staging area
   169   
   169   
   170   hg update .
   170   hg update .
   171   $ hg githelp -- reset --soft HEAD
   171   $ hg githelp -- reset --soft HEAD
   172   NOTE: --soft has no meaning since Mercurial has no staging area
   172   note: --soft has no meaning since Mercurial has no staging area
   173   
   173   
   174   hg update .
   174   hg update .
   175   $ hg githelp -- reset --hard HEAD
   175   $ hg githelp -- reset --hard HEAD
   176   hg update --clean .
   176   hg update --clean .
   177 
   177 
   219   $ hg githelp -- git stash drop xyz
   219   $ hg githelp -- git stash drop xyz
   220   hg shelve -d xyz
   220   hg shelve -d xyz
   221 
   221 
   222 githelp for whatchanged should show deprecated message
   222 githelp for whatchanged should show deprecated message
   223   $ hg githelp -- whatchanged -p
   223   $ hg githelp -- whatchanged -p
   224   This command has been deprecated in the git project, thus isn't supported by this tool.
   224   this command has been deprecated in the git project, thus isn't supported by this tool.
   225   
   225   
   226 
   226 
   227 githelp for git branch -m renaming
   227 githelp for git branch -m renaming
   228   $ hg githelp -- git branch -m old new
   228   $ hg githelp -- git branch -m old new
   229   hg bookmark -m old new
   229   hg bookmark -m old new
   257   hg import --no-commit -p 5
   257   hg import --no-commit -p 5
   258 
   258 
   259 git merge-base
   259 git merge-base
   260   $ hg githelp -- git merge-base --is-ancestor
   260   $ hg githelp -- git merge-base --is-ancestor
   261   ignoring unknown option --is-ancestor
   261   ignoring unknown option --is-ancestor
   262   NOTE: ancestors() is part of the revset language.
   262   note: ancestors() is part of the revset language.
   263   Learn more about revsets with 'hg help revsets'
   263   (learn more about revsets with 'hg help revsets')
   264   
   264   
   265   hg log -T '{node}\n' -r 'ancestor(A,B)'
   265   hg log -T '{node}\n' -r 'ancestor(A,B)'
   266 
   266 
   267 githelp for git blame
   267 githelp for git blame
   268   $ hg githelp -- git blame
   268   $ hg githelp -- git blame