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

filelog: extract metadata parsing and packing...

filelog: extract metadata parsing and packing _parsemeta returns the dictionary and a list of keys in the order they appear in metadata. This can be used to repack the dictionary in the same order. _packmeta creates metadata from a dictionary and an optional key-order list. In _parsemeta, we use slices and re.search indead of str.index so we can accept both buffers and strings.

Mads Kiilerich - - Load All Authors

File last commit:

r12640:6cc4b14f default


                r14074:e8271159

default

Download file

             test-rebase-keep-branch.t
        
                    71 lines
            
             | 946 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-keep-branch.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > rebase=

        > 

        > [alias]

        > tglog = log -G --template "{rev}: '{desc}' {branches}\n"

        > EOF

        $ hg init a

        $ cd a

        $ echo c1 > c1

        $ hg ci -Am c1

        adding c1

        $ echo c2 > c2

        $ hg ci -Am c2

        adding c2

        $ echo l1 > l1

        $ hg ci -Am l1

        adding l1

        $ echo l2 > l2

        $ hg ci -Am l2

        adding l2

        $ hg up -q -C 1

        $ hg branch 'notdefault'

        marked working directory as branch notdefault

        $ echo r1 > r1

        $ hg ci -Am r1

        adding r1

        $ hg tglog

        @  4: 'r1' notdefault

        |

        | o  3: 'l2'

        | |

        | o  2: 'l1'

        |/

        o  1: 'c2'

        |

        o  0: 'c1'

      Rebase a branch while preserving the branch name:

        $ hg up -q -C 3

        $ hg rebase -b 4 -d 3 --keepbranches

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

        $ hg tglog

        @  4: 'r1' notdefault

        |

        o  3: 'l2'

        |

        o  2: 'l1'

        |

        o  1: 'c2'

        |

        o  0: 'c1'

        $ hg branch

        notdefault

	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

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> graphlog=
				> rebase=
				>
				> [alias]
				> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
				> EOF


				$ hg init a
				$ cd a

				$ echo c1 > c1
				$ hg ci -Am c1
				adding c1

				$ echo c2 > c2
				$ hg ci -Am c2
				adding c2

				$ echo l1 > l1
				$ hg ci -Am l1
				adding l1

				$ echo l2 > l2
				$ hg ci -Am l2
				adding l2

				$ hg up -q -C 1

				$ hg branch 'notdefault'
				marked working directory as branch notdefault

				$ echo r1 > r1
				$ hg ci -Am r1
				adding r1

				$ hg tglog
				@ 4: 'r1' notdefault
				\|
				\| o 3: 'l2'
				\| \|
				\| o 2: 'l1'
				\|/
				o 1: 'c2'
				\|
				o 0: 'c1'


				Rebase a branch while preserving the branch name:

				$ hg up -q -C 3

				$ hg rebase -b 4 -d 3 --keepbranches
				saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 4: 'r1' notdefault
				\|
				o 3: 'l2'
				\|
				o 2: 'l1'
				\|
				o 1: 'c2'
				\|
				o 0: 'c1'

				$ hg branch
				notdefault