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

hgweb, spartan: add "URL breadcrumbs"...

hgweb, spartan: add "URL breadcrumbs" This change adds a "URL breadcrumb" to the "title" of the pages on the spartan template. By title I mean the first line that is shown right below the page selection row, which shows the name of the page that is being viewed, along with some additional information. In doing so it standarizes those "titles" which now follow the pattern: URL breadcumb / page details

timeless@mozdev.org - - Load All Authors

File last commit:

r17477:b1dfca74 default


                r18259:7bf412b7

default

Download file

             test-rebase-abort.t
        
                    158 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-abort.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > rebase=

        > 

        > [phases]

        > publish=False

        > 

        > [alias]

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

        > EOF

        $ hg init a

        $ cd a

        $ echo c1 > common

        $ hg add common

        $ hg ci -m C1

        $ echo c2 >> common

        $ hg ci -m C2

        $ echo c3 >> common

        $ hg ci -m C3

        $ hg up -q -C 1

        $ echo l1 >> extra

        $ hg add extra

        $ hg ci -m L1

        created new head

        $ sed -e 's/c2/l2/' common > common.new

        $ mv common.new common

        $ hg ci -m L2

        $ hg phase --force --secret 2

        $ hg tglog

        @  4:draft 'L2'

        |

        o  3:draft 'L1'

        |

        | o  2:secret 'C3'

        |/

        o  1:draft 'C2'

        |

        o  0:draft 'C1'

      Conflicting rebase:

        $ hg rebase -s 3 -d 2

        merging common

        warning: conflicts during merge.

        merging common incomplete! (edit conflicts, then use 'hg resolve --mark')

        abort: unresolved conflicts (see hg resolve, then hg rebase --continue)

        [255]

      Abort:

        $ hg rebase --abort

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

        rebase aborted

        $ hg tglog

        @  4:draft 'L2'

        |

        o  3:draft 'L1'

        |

        | o  2:secret 'C3'

        |/

        o  1:draft 'C2'

        |

        o  0:draft 'C1'

        $ cd ..

      Construct new repo:

        $ hg init b

        $ cd b

        $ echo a > a

        $ hg ci -Am A

        adding a

        $ echo b > b

        $ hg ci -Am B

        adding b

        $ echo c > c

        $ hg ci -Am C

        adding c

        $ hg up -q 0

        $ echo b > b

        $ hg ci -Am 'B bis'

        adding b

        created new head

        $ echo c1 > c

        $ hg ci -Am C1

        adding c

        $ hg phase --force --secret 1

        $ hg phase --public 1

      Rebase and abort without generating new changesets:

        $ hg tglog

        @  4:draft 'C1'

        |

        o  3:draft 'B bis'

        |

        | o  2:secret 'C'

        | |

        | o  1:public 'B'

        |/

        o  0:public 'A'

        $ hg rebase -b 4 -d 2

        merging c

        warning: conflicts during merge.

        merging c incomplete! (edit conflicts, then use 'hg resolve --mark')

        abort: unresolved conflicts (see hg resolve, then hg rebase --continue)

        [255]

        $ hg tglog

        @  4:draft 'C1'

        |

        o  3:draft 'B bis'

        |

        | @  2:secret 'C'

        | |

        | o  1:public 'B'

        |/

        o  0:public 'A'

        $ hg rebase -a

        rebase aborted

        $ hg tglog

        @  4:draft 'C1'

        |

        o  3:draft 'B bis'

        |

        | o  2:secret 'C'

        | |

        | o  1:public 'B'

        |/

        o  0:public 'A'

        $ 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}:{phase} '{desc}' {branches}\n"
				> EOF


				$ hg init a
				$ cd a

				$ echo c1 > common
				$ hg add common
				$ hg ci -m C1

				$ echo c2 >> common
				$ hg ci -m C2

				$ echo c3 >> common
				$ hg ci -m C3

				$ hg up -q -C 1

				$ echo l1 >> extra
				$ hg add extra
				$ hg ci -m L1
				created new head

				$ sed -e 's/c2/l2/' common > common.new
				$ mv common.new common
				$ hg ci -m L2

				$ hg phase --force --secret 2

				$ hg tglog
				@ 4:draft 'L2'
				\|
				o 3:draft 'L1'
				\|
				\| o 2:secret 'C3'
				\|/
				o 1:draft 'C2'
				\|
				o 0:draft 'C1'


				Conflicting rebase:

				$ hg rebase -s 3 -d 2
				merging common
				warning: conflicts during merge.
				merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
				abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
				[255]

				Abort:

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

				$ hg tglog
				@ 4:draft 'L2'
				\|
				o 3:draft 'L1'
				\|
				\| o 2:secret 'C3'
				\|/
				o 1:draft 'C2'
				\|
				o 0:draft 'C1'

				$ cd ..


				Construct new repo:

				$ hg init b
				$ cd b

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

				$ echo b > b
				$ hg ci -Am B
				adding b

				$ echo c > c
				$ hg ci -Am C
				adding c

				$ hg up -q 0

				$ echo b > b
				$ hg ci -Am 'B bis'
				adding b
				created new head

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

				$ hg phase --force --secret 1
				$ hg phase --public 1

				Rebase and abort without generating new changesets:

				$ hg tglog
				@ 4:draft 'C1'
				\|
				o 3:draft 'B bis'
				\|
				\| o 2:secret 'C'
				\| \|
				\| o 1:public 'B'
				\|/
				o 0:public 'A'

				$ hg rebase -b 4 -d 2
				merging c
				warning: conflicts during merge.
				merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
				abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
				[255]

				$ hg tglog
				@ 4:draft 'C1'
				\|
				o 3:draft 'B bis'
				\|
				\| @ 2:secret 'C'
				\| \|
				\| o 1:public 'B'
				\|/
				o 0:public 'A'

				$ hg rebase -a
				rebase aborted

				$ hg tglog
				@ 4:draft 'C1'
				\|
				o 3:draft 'B bis'
				\|
				\| o 2:secret 'C'
				\| \|
				\| o 1:public 'B'
				\|/
				o 0:public 'A'


				$ cd ..