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

rebase: do not add second parent to rebased changeset (drop detach option) (BC)...

rebase: do not add second parent to rebased changeset (drop detach option) (BC) Rebase now behaves as if --detach was always passed. Non-merges are rebased as non-merges, regardless of their parent being an ancestor of the destination. Merges will usually be rebased as merges unless both of their parents are ancestors of the destination, or one of their parents is pruned when rebased. This only alters the behavior of rebase when using the --source/--rev options. --detach option is deprecated. All test changes were carefully validated.

Pierre-Yves David - - Load All Authors

File last commit:

r17005:50f43451 default


                r17005:50f43451

default

Download file

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

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > rebase=

        > 

        > [phases]

        > publish=False

        > 

        > [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 -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:

        $ cd ..

	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=
				>
				> [phases]
				> publish=False
				>
				> [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 -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:


				$ cd ..