Mercurial > evolve
view enable.sh @ 285:691cb55358b0
obsolete: do not obsolete rebase --detach nullmerge revs
Rebase state contains the changesets to rebase as well as 'nullmerge'
entries used drive the merge strategy. These nullmerge were not rebased
and should be ignored, and certainly not be marked obsolete.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Wed, 20 Jun 2012 14:43:20 +0200 |
parents | 909a3a079daf |
children | f4a00b2d8bfb |
line wrap: on
line source
#!/bin/sh here=`python -c "import os; print os.path.realpath('$0')"` repo_root=`dirname "$here"` if !( hg --version -q | grep -qe 'version 2\.[1-9]' ); then echo 'You need mercurial 2.1 or later' >&2 exit 2 fi cat << EOF >&2 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXX Add lines below to the [extensions] section of you hgrc XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX EOF cat << EOF | sed -e "s#XXXREPOPATHXXX#${repo_root}#" [extensions] ### experimental extensions for history rewriting # obsolete relation support (will move in core) obsolete=XXXREPOPATHXXX/hgext/obsolete.py # history rewriting UI # needed by evolve hgext.rebase= evolve=XXXREPOPATHXXX/hgext/evolve.py [alias] ### useful alias to check future amend result # equivalent to the qdiff command for mq # diff pdiff=diff --rev .^ # status pstatus=status --rev .^ # diff with the previous amend odiff=diff --rev 'limit(obsparents(.),1)' --rev . EOF cat << EOF >&2 ### check qsync-enable.sh if your need mq export too. EOF