Mercurial > hg
view tests/test-rebase-newancestor.t @ 16611:462dd183bd73 stable
build: fix hgrc manpage building with docutils 0.9
Since docutils 0.9, `roman` module has been moved from module directory root
(i.e. `site-packages/roman.py`) to `docutils.utils` module. Therefore `import
roman` statement should be wrapped in `try: ... except ImportError: ...` block
to handle importing correctly.
author | Nikolaj Sjujskij <sterkrig@myopera.com> |
---|---|
date | Tue, 08 May 2012 23:59:39 +0400 |
parents | 6cc4b14fb76b |
children | f2719b387380 |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [extensions] > graphlog= > rebase= > > [alias] > tglog = log -G --template "{rev}: '{desc}' {branches}\n" > EOF $ hg init repo $ cd repo $ echo A > a $ echo >> a $ hg ci -Am A adding a $ echo B > a $ echo >> a $ hg ci -m B $ echo C > a $ echo >> a $ hg ci -m C $ hg up -q -C 0 $ echo D >> a $ hg ci -Am AD created new head $ hg tglog @ 3: 'AD' | | o 2: 'C' | | | o 1: 'B' |/ o 0: 'A' $ hg rebase -s 1 -d 3 merging a merging a saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @ 3: 'C' | o 2: 'B' | o 1: 'AD' | o 0: 'A'