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

transplant: use peer of source repository as "remote" for "repo.pull()"...

transplant: use peer of source repository as "remote" for "repo.pull()" Before this patch, transplant with "--merge" option fails with traceback unexpectedly, if it causes pull from the source repository on the local host. "discovery.findcommonincoming()" invokes "capable()" method on the object given from "localrepository.pull()", but it is "localrepository" object in this case and doesn't have such method. This patch uses peer object of source repository as "remote" argument for "localrepository.pull()" invocation like other invocations of it in transplant.py.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r20020:6fb59247

default

Download file

             test-resolve.t
        
                    46 lines
            
             | 853 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-resolve.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Nicolas Dumazet
    
tests: unify test-resolve

              r12117
            
      test that a commit clears the merge state.

        $ hg init repo

        $ cd repo

        $ echo foo > file

        $ hg commit -Am 'add file'

        adding file

        $ echo bar >> file

        $ hg commit -Am 'append bar'

      create a second head

        $ hg up -C 0

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

        $ echo baz >> file

        $ hg commit -Am 'append baz'

        created new head

      failing merge

        Steve Borho
    
merge: implement --tool arguments using new ui.forcemerge configurable...

              r12788
            
        $ hg merge --tool=internal:fail

        Nicolas Dumazet
    
tests: unify test-resolve

              r12117
            
        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-resolve

              r12117
            
        $ echo resolved > file

        $ hg resolve -m file

        $ hg commit -m 'resolved'

      resolve -l, should be empty

        $ hg resolve -l

      test crashed merge with empty mergestate

        $ mkdir .hg/merge

        $ touch .hg/merge/state

      resolve -l, should be empty

        $ hg resolve -l

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

	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-resolve	r12117	test that a commit clears the merge state.

		$ hg init repo
		$ cd repo

		$ echo foo > file
		$ hg commit -Am 'add file'
		adding file

		$ echo bar >> file
		$ hg commit -Am 'append bar'


		create a second head

		$ hg up -C 0
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ echo baz >> file
		$ hg commit -Am 'append baz'
		created new head

		failing merge

Steve Borho merge: implement --tool arguments using new ui.forcemerge configurable...	r12788	$ hg merge --tool=internal:fail
Nicolas Dumazet tests: unify test-resolve	r12117	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-resolve	r12117
		$ echo resolved > file
		$ hg resolve -m file
		$ hg commit -m 'resolved'

		resolve -l, should be empty

		$ hg resolve -l

		test crashed merge with empty mergestate

		$ mkdir .hg/merge
		$ touch .hg/merge/state

		resolve -l, should be empty

		$ hg resolve -l
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..