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

httprepo: long arguments support (issue2126)...

httprepo: long arguments support (issue2126) Send the command arguments in the HTTP headers. The command is still part of the URL. If the server does not have the 'httpheader' capability, the client will send the command arguments in the URL as it did previously. Web servers typically allow more data to be placed within the headers than in the URL, so this approach will: - Avoid HTTP errors due to using a URL that is too large. - Allow Mercurial to implement a more efficient wire protocol. An alternate approach is to send the arguments as part of the request body. This approach has been rejected because it requires the use of POST requests, so it would break any existing configuration that relies on the request type for authentication or caching. Extensibility: - The header size is provided by the server, which makes it possible to introduce an hgrc setting for it. - The client ignores the capability value after the first comma, which allows more information to be included in the future.

Patrick Mezard - - Load All Authors

File last commit:

r13541:919174c0 stable


                r14093:ce99d887

default

Download file

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

        @  5: 'L3'

        |

        o  4: 'L2'

        |

        o  3: 'L1'

        |

        | o  2: 'C3'

        |/

        o  1: 'C2'

        |

        o  0: '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 failed!

        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: 'L3'

        |

        o  4: 'L2'

        |

        o  3: 'L1'

        |

        o  2: 'C3'

        |

        o  1: 'C2'

        |

        o  0: '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=
				>
				> [alias]
				> tglog = log -G --template "{rev}: '{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 tglog
				@ 5: 'L3'
				\|
				o 4: 'L2'
				\|
				o 3: 'L1'
				\|
				\| o 2: 'C3'
				\|/
				o 1: 'C2'
				\|
				o 0: '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 failed!
				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: 'L3'
				\|
				o 4: 'L2'
				\|
				o 3: 'L1'
				\|
				o 2: 'C3'
				\|
				o 1: 'C2'
				\|
				o 0: '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