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

rhg: add resolve_file_args to path_utils.rs...

rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

Arseniy Alekseyev - - Load All Authors

File last commit:

r50516:55c6ebd1 stable


                r53438:f33f37ac

tip default

Download file

             test-merge4.t
        
                    60 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge4.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Arseniy Alekseyev
    
tests: run many tests in $TESTTMP/repo instead of $TESTTMP...

              r50516
            
        $ hg init repo

        $ cd repo

        Pradeepkumar Gayam
    
tests: unify test-merge4

              r11977
            
        $ echo This is file a1 > a

        $ hg add a

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

              r12156
            
        $ hg commit -m "commit #0"

        Pradeepkumar Gayam
    
tests: unify test-merge4

              r11977
            
        $ echo This is file b1 > b

        $ hg add b

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

              r12156
            
        $ hg commit -m "commit #1"

        Pradeepkumar Gayam
    
tests: unify test-merge4

              r11977
            
        $ hg update 0

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

        $ echo This is file c1 > c

        $ hg add c

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

              r12156
            
        $ hg commit -m "commit #2"

        Pradeepkumar Gayam
    
tests: unify test-merge4

              r11977
            
        created new head

        $ hg merge 1

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

        (branch merge, don't forget to commit)

        $ rm b

        $ echo This is file c22 > c

        Patrick Mezard
    
commit: abort on merge with missing files...

              r16536
            
      Test hg behaves when committing with a missing file added by a merge

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

              r12156
            
        $ hg commit -m "commit #3"

        Patrick Mezard
    
commit: abort on merge with missing files...

              r16536
            
        abort: cannot commit merge with missing files

        [255]

        Pradeepkumar Gayam
    
tests: unify test-merge4

              r11977
            
        Martin von Zweigbergk
    
revset: add a revset for parents in merge state...

              r44817
            
      Test conflict*() revsets

      # Bad usage

        $ hg log -r 'conflictlocal(foo)'

        hg: parse error: conflictlocal takes no arguments

        Martin von Zweigbergk
    
errors: use exit code 10 for parse errors...

              r46507
            
        [10]

        Martin von Zweigbergk
    
revset: add a revset for parents in merge state...

              r44817
            
        $ hg log -r 'conflictother(foo)'

        hg: parse error: conflictother takes no arguments

        Martin von Zweigbergk
    
errors: use exit code 10 for parse errors...

              r46507
            
        [10]

        Martin von Zweigbergk
    
revset: add a revset for parents in merge state...

              r44817
            
        $ hg co -C .

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

      # No merge parents when not merging

        $ hg log -r 'conflictlocal() + conflictother()'

      # No merge parents when there is no conflict

        $ hg merge 1

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

        (branch merge, don't forget to commit)

        $ hg log -r 'conflictlocal() + conflictother()'

        $ hg co -C .

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

        $ echo conflict > b

        $ hg ci -Aqm 'conflicting change to b'

        $ hg merge 1

        merging b

        warning: conflicts while merging b! (edit, 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 merge --abort' to abandon

        [1]

      # Shows merge parents when there is a conflict

        $ hg log -r 'conflictlocal()' -T '{rev} {desc}\n'

        3 conflicting change to b

        $ hg log -r 'conflictother()' -T '{rev} {desc}\n'

        1 commit #1

	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

Arseniy Alekseyev tests: run many tests in $TESTTMP/repo instead of $TESTTMP...	r50516	$ hg init repo
		$ cd repo
Pradeepkumar Gayam tests: unify test-merge4	r11977	$ echo This is file a1 > a
		$ hg add a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit #0"
Pradeepkumar Gayam tests: unify test-merge4	r11977	$ echo This is file b1 > b
		$ hg add b
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit #1"
Pradeepkumar Gayam tests: unify test-merge4	r11977	$ hg update 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ echo This is file c1 > c
		$ hg add c
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit #2"
Pradeepkumar Gayam tests: unify test-merge4	r11977	created new head
		$ hg merge 1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ rm b
		$ echo This is file c22 > c
Patrick Mezard commit: abort on merge with missing files...	r16536
		Test hg behaves when committing with a missing file added by a merge

Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit #3"
Patrick Mezard commit: abort on merge with missing files...	r16536	abort: cannot commit merge with missing files
		[255]
Pradeepkumar Gayam tests: unify test-merge4	r11977
Martin von Zweigbergk revset: add a revset for parents in merge state...	r44817
		Test conflict*() revsets

		# Bad usage
		$ hg log -r 'conflictlocal(foo)'
		hg: parse error: conflictlocal takes no arguments
Martin von Zweigbergk errors: use exit code 10 for parse errors...	r46507	[10]
Martin von Zweigbergk revset: add a revset for parents in merge state...	r44817	$ hg log -r 'conflictother(foo)'
		hg: parse error: conflictother takes no arguments
Martin von Zweigbergk errors: use exit code 10 for parse errors...	r46507	[10]
Martin von Zweigbergk revset: add a revset for parents in merge state...	r44817	$ hg co -C .
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		# No merge parents when not merging
		$ hg log -r 'conflictlocal() + conflictother()'
		# No merge parents when there is no conflict
		$ hg merge 1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg log -r 'conflictlocal() + conflictother()'
		$ hg co -C .
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ echo conflict > b
		$ hg ci -Aqm 'conflicting change to b'
		$ hg merge 1
		merging b
		warning: conflicts while merging b! (edit, 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 merge --abort' to abandon
		[1]
		# Shows merge parents when there is a conflict
		$ hg log -r 'conflictlocal()' -T '{rev} {desc}\n'
		3 conflicting change to b
		$ hg log -r 'conflictother()' -T '{rev} {desc}\n'
		1 commit #1