upstream/mercurial-mirror Files · tests/test-update-reverse.t

transplant: use "ui.extractchoices()" to show the list of available responses...

transplant: use "ui.extractchoices()" to show the list of available responses Before this patch, transplant extension shows the list of available responses by specific string, even though the prompt string passed to "ui.promptchoice()" has enough (maybe i18n-ed) information. This patch uses "ui.extractchoices()" to show the list of available responses.

FUJIWARA Katsunori - - Load All Authors

File last commit:

r19095:5cc71484 stable


                r20269:acb6ccea

default

Download file

             test-update-reverse.t
        
                    84 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-reverse.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg init

        $ touch a

        $ hg add a

        $ hg commit -m "Added a"

        $ touch main

        $ hg add main

        $ hg commit -m "Added main"

        $ hg checkout 0

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

      'main' should be gone:

        $ ls

        a

        $ touch side1

        $ hg add side1

        $ hg commit -m "Added side1"

        created new head

        $ touch side2

        $ hg add side2

        $ hg commit -m "Added side2"

        $ hg log

        changeset:   3:91ebc10ed028

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Added side2

        changeset:   2:b932d7dbb1e1

        parent:      0:c2eda428b523

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Added side1

        changeset:   1:71a760306caf

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Added main

        changeset:   0:c2eda428b523

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Added a

        $ hg heads

        changeset:   3:91ebc10ed028

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Added side2

        changeset:   1:71a760306caf

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Added main

        $ ls

        a

        side1

        side2

        $ hg update --debug -C 1

        resolving manifests

        Siddharth Agarwal
    
manifestmerge: pass in branchmerge and force separately...

              r18605
            
         branchmerge: False, force: True, partial: False

        Martin Geisler
    
merge: make debug output easier to read...

              r15625
            
         ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf

        Mads Kiilerich
    
merge: process files in sorted order

              r18360
            
         side1: other deleted -> r

        Adrian Buehlmann
    
combine tests

              r12279
            
         side2: other deleted -> r

         main: remote created -> g

        Bryan O'Sullivan
    
tests: update test output (will be folded into parent)

              r18631
            
        removing side1

        removing side2

        FUJIWARA Katsunori
    
merge: increase safety of parallel updating/removing on icasefs...

              r19095
            
        updating: side2 2/3 files (66.67%)

        Bryan O'Sullivan
    
tests: update test output (will be folded into parent)

              r18631
            
        getting main

        Adrian Buehlmann
    
combine tests

              r12279
            
        updating: main 3/3 files (100.00%)

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

        $ ls

        a

        main

	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

Adrian Buehlmann combine tests	r12279	$ hg init

		$ touch a
		$ hg add a
		$ hg commit -m "Added a"

		$ touch main
		$ hg add main
		$ hg commit -m "Added main"
		$ hg checkout 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved

		'main' should be gone:

		$ ls
		a

		$ touch side1
		$ hg add side1
		$ hg commit -m "Added side1"
		created new head
		$ touch side2
		$ hg add side2
		$ hg commit -m "Added side2"

		$ hg log
		changeset: 3:91ebc10ed028
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: Added side2

		changeset: 2:b932d7dbb1e1
		parent: 0:c2eda428b523
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: Added side1

		changeset: 1:71a760306caf
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: Added main

		changeset: 0:c2eda428b523
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: Added a


		$ hg heads
		changeset: 3:91ebc10ed028
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: Added side2

		changeset: 1:71a760306caf
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: Added main

		$ ls
		a
		side1
		side2

		$ hg update --debug -C 1
		resolving manifests
Siddharth Agarwal manifestmerge: pass in branchmerge and force separately...	r18605	branchmerge: False, force: True, partial: False
Martin Geisler merge: make debug output easier to read...	r15625	ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
Mads Kiilerich merge: process files in sorted order	r18360	side1: other deleted -> r
Adrian Buehlmann combine tests	r12279	side2: other deleted -> r
		main: remote created -> g
Bryan O'Sullivan tests: update test output (will be folded into parent)	r18631	removing side1
		removing side2
FUJIWARA Katsunori merge: increase safety of parallel updating/removing on icasefs...	r19095	updating: side2 2/3 files (66.67%)
Bryan O'Sullivan tests: update test output (will be folded into parent)	r18631	getting main
Adrian Buehlmann combine tests	r12279	updating: main 3/3 files (100.00%)
		1 files updated, 0 files merged, 2 files removed, 0 files unresolved

		$ ls
		a
		main