upstream/mercurial-mirror Files · tests/test-rebase-newancestor.t

revset: add ^ and ~ operators from parentrevspec extension...

revset: add ^ and ~ operators from parentrevspec extension ^ (Nth parent) and ~ (Nth first ancestor) are infix operators that match certain ancestors of the set: set^0 the set set^1 (also available as set^) the first parent of every changeset in set set^2 the second parent of every changeset in set set~0 the set set~1 the first ancestor (i.e. the first parent) of every changeset in set set~2 the second ancestor (i.e. first parent of first parent) of every changeset in set set~N the Nth ancestor (following first parents only) of every changeset in set; set~N is equivalent to set^1^1..., with ^1 repeated N times.

Mads Kiilerich - - Load All Authors

File last commit:

r12640:6cc4b14f default


                r14070:305c9767

default

Download file

             test-rebase-newancestor.t
        
                    54 lines
            
             | 691 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-newancestor.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-rebase*

              r12608
            
        $ 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

        Mads Kiilerich
    
tests: remove redundant globs...

              r12640
            
        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)

        Adrian Buehlmann
    
tests: unify test-rebase*

              r12608
            
        $ hg tglog

        @  3: 'C'

        |

        o  2: 'B'

        |

        o  1: 'AD'

        |

        o  0: 'A'

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Adrian Buehlmann tests: unify test-rebase*	r12608	$ 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
Mads Kiilerich tests: remove redundant globs...	r12640	saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)
Adrian Buehlmann tests: unify test-rebase*	r12608
		$ hg tglog
		@ 3: 'C'
		\|
		o 2: 'B'
		\|
		o 1: 'AD'
		\|
		o 0: 'A'