upstream/mercurial-mirror Files · tests/test-archive-symlinks.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:

r29844:c4d03b6d default


                r38817:bb54db4a

@96 default

Download file

             test-archive-symlinks.t
        
                    42 lines
            
             | 665 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-archive-symlinks.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require symlink

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        $ origdir=`pwd`

        $ hg init repo

        $ cd repo

        $ ln -s nothing dangling

      avoid tar warnings about old timestamp

        $ hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink'

        $ hg archive -t files ../archive

        $ hg archive -t tar -p tar ../archive.tar

        $ hg archive -t zip -p zip ../archive.zip

      files

        $ cd "$origdir"

        $ cd archive

        Matt Mackall
    
tests: drop explicit $TESTDIR from executables...

              r25472
            
        $ readlink.py dangling

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        dangling -> nothing

      tar

        $ cd "$origdir"

        $ tar xf archive.tar

        $ cd tar

        Matt Mackall
    
tests: drop explicit $TESTDIR from executables...

              r25472
            
        $ readlink.py dangling

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        dangling -> nothing

        Augie Fackler
    
tests: guard test-archive-symlink with unziplinks check...

              r29844
            
      #if unziplinks

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
      zip

        $ cd "$origdir"

        Matt Mackall
    
tests: suppress spurious lchmod error from unzip (issue4088)...

              r21216
            
        $ unzip archive.zip > /dev/null 2>&1

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        $ cd zip

        Matt Mackall
    
tests: drop explicit $TESTDIR from executables...

              r25472
            
        $ readlink.py dangling

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        dangling -> nothing

        Augie Fackler
    
tests: guard test-archive-symlink with unziplinks check...

              r29844
            
      #endif

        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

Matt Mackall tests: replace exit 80 with #require	r22046	#require symlink
Martin Geisler tests: unify test-archive-symlinks	r11854
		$ origdir=`pwd`

		$ hg init repo
		$ cd repo
		$ ln -s nothing dangling

		avoid tar warnings about old timestamp

		$ hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink'

		$ hg archive -t files ../archive
		$ hg archive -t tar -p tar ../archive.tar
		$ hg archive -t zip -p zip ../archive.zip

		files

		$ cd "$origdir"
		$ cd archive
Matt Mackall tests: drop explicit $TESTDIR from executables...	r25472	$ readlink.py dangling
Martin Geisler tests: unify test-archive-symlinks	r11854	dangling -> nothing

		tar

		$ cd "$origdir"
		$ tar xf archive.tar
		$ cd tar
Matt Mackall tests: drop explicit $TESTDIR from executables...	r25472	$ readlink.py dangling
Martin Geisler tests: unify test-archive-symlinks	r11854	dangling -> nothing

Augie Fackler tests: guard test-archive-symlink with unziplinks check...	r29844	#if unziplinks
Martin Geisler tests: unify test-archive-symlinks	r11854	zip

		$ cd "$origdir"
Matt Mackall tests: suppress spurious lchmod error from unzip (issue4088)...	r21216	$ unzip archive.zip > /dev/null 2>&1
Martin Geisler tests: unify test-archive-symlinks	r11854	$ cd zip
Matt Mackall tests: drop explicit $TESTDIR from executables...	r25472	$ readlink.py dangling
Martin Geisler tests: unify test-archive-symlinks	r11854	dangling -> nothing
Augie Fackler tests: guard test-archive-symlink with unziplinks check...	r29844	#endif
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..