upstream/mercurial-mirror Files · tests/test-convert-bzr-treeroot.t

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Augie Fackler - - Load All Authors

File last commit:

r32940:75be1499 default


                r38817:bb54db4a

@96 default

Download file

             test-convert-bzr-treeroot.t
        
                    36 lines
            
             | 788 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-bzr-treeroot.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Gregory Szorc
    
tests: move '#require bzr' into .t files...

              r26066
            
      #require bzr

        Matt Mackall
    
tests: unify test-convert-bzr-treeroot

              r12517
            
        $ . "$TESTDIR/bzr-definitions"

        $ cat > treeset.py <<EOF

        > import sys

        > from bzrlib import workingtree

        > wt = workingtree.WorkingTree.open('.')

        > 

        > message, rootid = sys.argv[1:]

        > wt.set_root_id('tree_root-%s' % rootid)

        > wt.commit(message)

        > EOF

      change the id of the tree root

        $ mkdir test-change-treeroot-id

        $ cd test-change-treeroot-id

        $ bzr init -q source

        $ cd source

        $ echo content > file

        $ bzr add -q file

        $ bzr commit -q -m 'Initial add'

        Augie Fackler
    
cleanup: use $PYTHON to run python in many more tests...

              r32940
            
        $ $PYTHON ../../treeset.py 'Changed root' new

        Matt Mackall
    
tests: unify test-convert-bzr-treeroot

              r12517
            
        $ cd ..

        $ hg convert source source-hg

        initializing destination source-hg repository

        scanning source...

        sorting...

        converting...

        1 Initial add

        0 Changed root

        $ manifest source-hg tip

        % manifest of tip

        644   file

        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

Gregory Szorc tests: move '#require bzr' into .t files...	r26066	#require bzr
Matt Mackall tests: unify test-convert-bzr-treeroot	r12517
		$ . "$TESTDIR/bzr-definitions"
		$ cat > treeset.py <<EOF
		> import sys
		> from bzrlib import workingtree
		> wt = workingtree.WorkingTree.open('.')
		>
		> message, rootid = sys.argv[1:]
		> wt.set_root_id('tree_root-%s' % rootid)
		> wt.commit(message)
		> EOF

		change the id of the tree root

		$ mkdir test-change-treeroot-id
		$ cd test-change-treeroot-id
		$ bzr init -q source
		$ cd source
		$ echo content > file
		$ bzr add -q file
		$ bzr commit -q -m 'Initial add'
Augie Fackler cleanup: use $PYTHON to run python in many more tests...	r32940	$ $PYTHON ../../treeset.py 'Changed root' new
Matt Mackall tests: unify test-convert-bzr-treeroot	r12517	$ cd ..
		$ hg convert source source-hg
		initializing destination source-hg repository
		scanning source...
		sorting...
		converting...
		1 Initial add
		0 Changed root
		$ manifest source-hg tip
		% manifest of tip
		644 file
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..