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

resolve: fix incorrect merge...

resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r27025:ec372573

default

Download file

             test-1102.t
        
                    17 lines
            
             | 354 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-1102.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: unify test-1102

              r11847
            
        $ rm -rf a

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Am0

        adding a

        $ hg tag t1 # 1

        $ hg tag --remove t1 # 2

        $ hg co 1

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

        Kevin Bullock
    
tag: abort if not at a branch head (issue2552)...

              r13135
            
        $ hg tag -f -r0 t1

        Martin Geisler
    
tests: unify test-1102

              r11847
            
        $ hg tags

        tip                                3:a49829c4fc11

        t1                                 0:f7b1eb17ad24

        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

Martin Geisler tests: unify test-1102	r11847	$ rm -rf a
		$ hg init a
		$ cd a
		$ echo a > a
		$ hg ci -Am0
		adding a
		$ hg tag t1 # 1
		$ hg tag --remove t1 # 2

		$ hg co 1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Kevin Bullock tag: abort if not at a branch head (issue2552)...	r13135	$ hg tag -f -r0 t1
Martin Geisler tests: unify test-1102	r11847	$ hg tags
		tip 3:a49829c4fc11
		t1 0:f7b1eb17ad24

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