upstream/mercurial-mirror Files · tests/test-conflict.t

subrepo: add test whether "[paths]" is configured correctly at subrepo creation...

subrepo: add test whether "[paths]" is configured correctly at subrepo creation This test is added for changes in the subsequent patch. This test doesn't use "(glob)" for expected output, because "[paths]" is configured at subrepo creation by "_abssource()" using "posixpath.join()" to join path components.

FUJIWARA Katsunori - - Load All Authors

File last commit:

r21865:78e56e70 default


                r21890:0f916db7

default

Download file

             test-conflict.t
        
                    126 lines
            
             | 3.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-conflict.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ hg init

        $ echo "nothing" > a

        $ hg add a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m ancestor

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ echo "something" > a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m branch1

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ hg co 0

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ echo "something else" > a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m branch2

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        created new head

        $ hg merge 1

        merging a

        warning: conflicts during merge.

        Matt Mackall
    
merge: give a special message for internal:merge failure (issue3105)

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

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        0 files updated, 0 files merged, 0 files removed, 1 files unresolved

        Brodie Rao
    
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...

              r12314
            
        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ hg id

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        32e80765d7fe+75234512624c+ tip

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ cat a

        Pierre-Yves David
    
merge: drop the quotes around commit description...

              r21693
            
        <<<<<<< local: 32e80765d7fe - test: branch2

        Durham Goode
    
merge: add conflict marker formatter (BC)...

              r21519
            
        something else

        =======

        something

        Pierre-Yves David
    
merge: drop the quotes around commit description...

              r21693
            
        >>>>>>> other: 75234512624c  - test: branch1

        Durham Goode
    
merge: add conflict marker formatter (BC)...

              r21519
            
        $ hg status

        M a

        ? a.orig

      Verify custom conflict markers

        $ hg up -q --clean .

        $ printf "\n[ui]\nmergemarkertemplate={author} {rev}\n" >> .hg/hgrc

        $ hg merge 1

        merging a

        warning: conflicts during merge.

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

        0 files updated, 0 files merged, 0 files removed, 1 files unresolved

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

        $ cat a

        <<<<<<< local: test 2

        something else

        =======

        something

        >>>>>>> other: test 1

        FUJIWARA Katsunori
    
filemerge: use only the first line of the generated conflict marker for safety...

              r21864
            
      Verify line splitting of custom conflict marker which causes multiple lines

        $ hg up -q --clean .

        $ cat >> .hg/hgrc <<EOF

        > [ui]

        > mergemarkertemplate={author} {rev}\nfoo\nbar\nbaz

        > EOF

        $ hg -q merge 1

        warning: conflicts during merge.

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

        [1]

        $ cat a

        <<<<<<< local: test 2

        something else

        =======

        something

        >>>>>>> other: test 1

        FUJIWARA Katsunori
    
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly...

              r21865
            
      Verify line trimming of custom conflict marker using multi-byte characters

        $ hg up -q --clean .

        $ python <<EOF

        > fp = open('logfile', 'w')

        > fp.write('12345678901234567890123456789012345678901234567890' +

        >          '1234567890') # there are 5 more columns for 80 columns

        > 

        > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes

        > fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8'))

        > 

        > fp.close()

        > EOF

        $ hg add logfile

        $ hg --encoding utf-8 commit --logfile logfile

        $ cat >> .hg/hgrc <<EOF

        > [ui]

        > mergemarkertemplate={desc|firstline}

        > EOF

        $ hg -q --encoding utf-8 merge 1

        warning: conflicts during merge.

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

        [1]

        $ cat a

        <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc)

        something else

        =======

        something

        >>>>>>> other: branch1

        Durham Goode
    
merge: add conflict marker formatter (BC)...

              r21519
            
      Verify basic conflict markers

        FUJIWARA Katsunori
    
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly...

              r21865
            
        $ hg up -q --clean 2

        Durham Goode
    
merge: add conflict marker formatter (BC)...

              r21519
            
        $ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc

        $ hg merge 1

        merging a

        warning: conflicts during merge.

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

        0 files updated, 0 files merged, 0 files removed, 1 files unresolved

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

        $ cat a

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        <<<<<<< local

        something else

        =======

        something

        >>>>>>> other

	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

Nicolas Dumazet tests: unify test-conflict	r11797	$ hg init
		$ echo "nothing" > a
		$ hg add a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m ancestor
Nicolas Dumazet tests: unify test-conflict	r11797	$ echo "something" > a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m branch1
Nicolas Dumazet tests: unify test-conflict	r11797	$ hg co 0
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ echo "something else" > a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m branch2
Nicolas Dumazet tests: unify test-conflict	r11797	created new head

		$ hg merge 1
		merging a
		warning: conflicts during merge.
Matt Mackall merge: give a special message for internal:merge failure (issue3105)	r15501	merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
Nicolas Dumazet tests: unify test-conflict	r11797	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Brodie Rao merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...	r12314	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Nicolas Dumazet tests: unify test-conflict	r11797
		$ hg id
Martin Geisler tests: remove unneeded -d flags...	r12156	32e80765d7fe+75234512624c+ tip
Nicolas Dumazet tests: unify test-conflict	r11797
		$ cat a
Pierre-Yves David merge: drop the quotes around commit description...	r21693	<<<<<<< local: 32e80765d7fe - test: branch2
Durham Goode merge: add conflict marker formatter (BC)...	r21519	something else
		=======
		something
Pierre-Yves David merge: drop the quotes around commit description...	r21693	>>>>>>> other: 75234512624c - test: branch1
Durham Goode merge: add conflict marker formatter (BC)...	r21519
		$ hg status
		M a
		? a.orig

		Verify custom conflict markers

		$ hg up -q --clean .
		$ printf "\n[ui]\nmergemarkertemplate={author} {rev}\n" >> .hg/hgrc

		$ hg merge 1
		merging a
		warning: conflicts during merge.
		merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
		0 files updated, 0 files merged, 0 files removed, 1 files unresolved
		use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
		[1]

		$ cat a
		<<<<<<< local: test 2
		something else
		=======
		something
		>>>>>>> other: test 1

FUJIWARA Katsunori filemerge: use only the first line of the generated conflict marker for safety...	r21864	Verify line splitting of custom conflict marker which causes multiple lines

		$ hg up -q --clean .
		$ cat >> .hg/hgrc <<EOF
		> [ui]
		> mergemarkertemplate={author} {rev}\nfoo\nbar\nbaz
		> EOF

		$ hg -q merge 1
		warning: conflicts during merge.
		merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
		[1]

		$ cat a
		<<<<<<< local: test 2
		something else
		=======
		something
		>>>>>>> other: test 1

FUJIWARA Katsunori filemerge: use 'util.ellipsis' to trim custom conflict markers correctly...	r21865	Verify line trimming of custom conflict marker using multi-byte characters

		$ hg up -q --clean .
		$ python <<EOF
		> fp = open('logfile', 'w')
		> fp.write('12345678901234567890123456789012345678901234567890' +
		> '1234567890') # there are 5 more columns for 80 columns
		>
		> # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes
		> fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8'))
		>
		> fp.close()
		> EOF
		$ hg add logfile
		$ hg --encoding utf-8 commit --logfile logfile

		$ cat >> .hg/hgrc <<EOF
		> [ui]
		> mergemarkertemplate={desc\|firstline}
		> EOF

		$ hg -q --encoding utf-8 merge 1
		warning: conflicts during merge.
		merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
		[1]

		$ cat a
		<<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc)
		something else
		=======
		something
		>>>>>>> other: branch1

Durham Goode merge: add conflict marker formatter (BC)...	r21519	Verify basic conflict markers

FUJIWARA Katsunori filemerge: use 'util.ellipsis' to trim custom conflict markers correctly...	r21865	$ hg up -q --clean 2
Durham Goode merge: add conflict marker formatter (BC)...	r21519	$ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc

		$ hg merge 1
		merging a
		warning: conflicts during merge.
		merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
		0 files updated, 0 files merged, 0 files removed, 1 files unresolved
		use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
		[1]

		$ cat a
Nicolas Dumazet tests: unify test-conflict	r11797	<<<<<<< local
		something else
		=======
		something
		>>>>>>> other