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

tests: remove 'hghave symlink' from test-import-git.t...

tests: remove 'hghave symlink' from test-import-git.t The test had a long chain of commits depending on execbits in some of first commits. The hashes are checked throughout the file, so there was no elegant way to make it pass both with and without execbits. We now rollback the execbits-or-not commits and make a stable change instead. The hash chain is thus updated once but is now a bit more stable. The test coverage should be unaltered.

Pierre-Yves David - - Load All Authors

File last commit:

r15742:65df60a3 default


                r16910:ad229181

default

Download file

             test-rebase-bookmarks.t
        
                    88 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-bookmarks.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Stefano Tortarolo
    
rebase: reset bookmarks (issue2265 and issue2873)

              r14884
            
        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > rebase=

        > 

        Pierre-Yves David
    
phases: prevent rebase to rebase immutable changeset.

              r15742
            
        > [phases]

        > publish=False

        > 

        Stefano Tortarolo
    
rebase: reset bookmarks (issue2265 and issue2873)

              r14884
            
        > [alias]

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

        > EOF

      Create a repo with several bookmarks

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Am A

        adding a

        $ echo b > b

        $ hg ci -Am B

        adding b

        $ hg book 'X'

        $ hg book 'Y'

        $ echo c > c

        $ hg ci -Am C

        adding c

        $ hg book 'Z'

        $ hg up -q 0

        $ echo d > d

        $ hg ci -Am D

        adding d

        created new head

        $ hg tglog 

        @  3: 'D' bookmarks:

        |

        | o  2: 'C' bookmarks: Y Z

        | |

        | o  1: 'B' bookmarks: X

        |/

        o  0: 'A' bookmarks:

      Move only rebased bookmarks

        $ cd ..

        $ hg clone -q a a1

        $ cd a1

        $ hg up -q Z

        $ hg rebase --detach -s Y -d 3

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

        $ hg tglog 

        @  3: 'C' bookmarks: Y Z

        |

        o  2: 'D' bookmarks:

        |

        | o  1: 'B' bookmarks: X

        |/

        o  0: 'A' bookmarks:

      Keep bookmarks to the correct rebased changeset

        $ cd ..

        $ hg clone -q a a2

        $ cd a2

        $ hg up -q Z

        $ hg rebase -s 1 -d 3

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

        $ hg tglog 

        @  3: 'C' bookmarks: Y Z

        |

        o  2: 'B' bookmarks: X

        |

        o  1: 'D' bookmarks:

        |

        o  0: 'A' bookmarks:

	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

Stefano Tortarolo rebase: reset bookmarks (issue2265 and issue2873)	r14884	$ cat >> $HGRCPATH <<EOF
		> [extensions]
		> graphlog=
		> rebase=
		>
Pierre-Yves David phases: prevent rebase to rebase immutable changeset.	r15742	> [phases]
		> publish=False
		>
Stefano Tortarolo rebase: reset bookmarks (issue2265 and issue2873)	r14884	> [alias]
		> tglog = log -G --template "{rev}: '{desc}' bookmarks: {bookmarks}\n"
		> EOF

		Create a repo with several bookmarks
		$ hg init a
		$ cd a

		$ echo a > a
		$ hg ci -Am A
		adding a

		$ echo b > b
		$ hg ci -Am B
		adding b
		$ hg book 'X'
		$ hg book 'Y'

		$ echo c > c
		$ hg ci -Am C
		adding c
		$ hg book 'Z'

		$ hg up -q 0

		$ echo d > d
		$ hg ci -Am D
		adding d
		created new head

		$ hg tglog
		@ 3: 'D' bookmarks:
		\|
		\| o 2: 'C' bookmarks: Y Z
		\| \|
		\| o 1: 'B' bookmarks: X
		\|/
		o 0: 'A' bookmarks:


		Move only rebased bookmarks

		$ cd ..
		$ hg clone -q a a1

		$ cd a1
		$ hg up -q Z

		$ hg rebase --detach -s Y -d 3
		saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)

		$ hg tglog
		@ 3: 'C' bookmarks: Y Z
		\|
		o 2: 'D' bookmarks:
		\|
		\| o 1: 'B' bookmarks: X
		\|/
		o 0: 'A' bookmarks:

		Keep bookmarks to the correct rebased changeset

		$ cd ..
		$ hg clone -q a a2

		$ cd a2
		$ hg up -q Z

		$ hg rebase -s 1 -d 3
		saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)

		$ hg tglog
		@ 3: 'C' bookmarks: Y Z
		\|
		o 2: 'B' bookmarks: X
		\|
		o 1: 'D' bookmarks:
		\|
		o 0: 'A' bookmarks: