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

hgweb: add block numbers to diff regions and related links...

hgweb: add block numbers to diff regions and related links The changeset view may show several diff regions, one per file, and this patch numbers each of them so that links produced by the filenodelink fragment can reference each diff region produced by the diffblock fragment through the use of the blockno variable made available to both of them. This permits navigation to diff regions on the changeset page from the file list, and where the :target pseudo-class is supported in browsers, permits selective presentation of diffs, showing one at a time instead of potentially many in what would otherwise be a very long page that is difficult to navigate.

Alain Leufroy <alain.leufroyATgmailMYDOTcom> - - Load All Authors

File last commit:

r15917:e66084ef default


                r16308:2695aaf4

default

Download file

             test-rebase-conflicts.t
        
                    120 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-conflicts.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

        $ echo l3 >> extra2

        $ hg add extra2

        $ hg ci -m L3

        $ hg phase --force --secret 4

        $ hg tglog

        @  5:secret 'L3'

        |

        o  4:secret 'L2'

        |

        o  3:draft 'L1'

        |

        | o  2:draft 'C3'

        |/

        o  1:draft 'C2'

        |

        o  0:draft 'C1'

      Try to call --continue:

        $ hg rebase --continue

        abort: no rebase in progress

        [255]

      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]

      Try to continue without solving the conflict:

        $ hg rebase --continue 

        abort: unresolved merge conflicts (see hg help resolve)

        [255]

      Conclude rebase:

        $ echo 'resolved merge' >common

        $ hg resolve -m common

        $ hg rebase --continue

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

        $ hg tglog

        @  5:secret 'L3'

        |

        o  4:secret 'L2'

        |

        o  3:draft 'L1'

        |

        o  2:draft 'C3'

        |

        o  1:draft 'C2'

        |

        o  0:draft 'C1'

      Check correctness:

        $ hg cat -r 0 common

        c1

        $ hg cat -r 1 common

        c1

        c2

        $ hg cat -r 2 common

        c1

        c2

        c3

        $ hg cat -r 3 common

        c1

        c2

        c3

        $ hg cat -r 4 common

        resolved merge

        $ hg cat -r 5 common

        resolved merge

	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

				$ echo l3 >> extra2
				$ hg add extra2
				$ hg ci -m L3

				$ hg phase --force --secret 4

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

				Try to call --continue:

				$ hg rebase --continue
				abort: no rebase in progress
				[255]

				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]

				Try to continue without solving the conflict:

				$ hg rebase --continue
				abort: unresolved merge conflicts (see hg help resolve)
				[255]

				Conclude rebase:

				$ echo 'resolved merge' >common
				$ hg resolve -m common
				$ hg rebase --continue
				saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

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

				Check correctness:

				$ hg cat -r 0 common
				c1

				$ hg cat -r 1 common
				c1
				c2

				$ hg cat -r 2 common
				c1
				c2
				c3

				$ hg cat -r 3 common
				c1
				c2
				c3

				$ hg cat -r 4 common
				resolved merge

				$ hg cat -r 5 common
				resolved merge