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

i18n: use UTF-8 string to lower filename for case collision check...

i18n: use UTF-8 string to lower filename for case collision check Some character sets, cp932 (known as Shift-JIS for Japanese) for example, use 0x41('A') - 0x5A('Z') and 0x61('a') - 0x7A('z') as second or later character. In such character set, case collision checking recognizes different files as CASEFOLDED same file, if filenames are treated as byte sequence. win32mbcs extension is not appropriate to handle this problem, because this problem can occur on other than Windows platform only if problematic character set is used. Callers of util.checkcase() use known ASCII filenames as last component of path, and string.lower() is not applied to directory part of path. So, util.checkcase() is kept intact, even though it applies string.lower() to filenames.

Patrick Mezard - - Load All Authors

File last commit:

r13541:919174c0 stable


                r14980:28e98a8b

stable

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