Mercurial > hg
view tests/test-rebase-newancestor.t @ 19953:593207462618 stable
largefiles: remove extra check for file to get - it _is_ by definition in p2
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 25 Oct 2013 02:25:10 +0800 |
parents | 9c78ed396075 |
children | aa9385f983fa |
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 o 3: 'C' | o 2: 'B' | @ 1: 'AD' | o 0: 'A' $ cd ..