upstream/mercurial-mirror Files · tests/test-filecache.py.out

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

FUJIWARA Katsunori - - Load All Authors

File last commit:

r29995:57830bd0 default


                r38817:bb54db4a

@96 default

Download file

             test-filecache.py.out
        
                    63 lines
            
             | 1.1 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-filecache.py.out

History | Source | Raw |Copy content |Copy permalink

Idan Kamara scmutil: introduce filecache...	r14928	basic:

Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* neither file exists
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* neither file still exists
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* empty file x created
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* file x changed size
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* nothing changed with either file
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* file x changed inode
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* empty file y created
		creating
		* file y changed size
		creating
		* file y changed inode
		creating
		* both files changed inode
		creating
Idan Kamara scmutil: introduce filecache...	r14928
		fakeuncacheable:

Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* neither file exists
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* neither file still exists
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* empty file x created
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* file x changed size
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* nothing changed with either file
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* file x changed inode
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* empty file y created
		creating
		* file y changed size
		creating
		* file y changed inode
		creating
		* both files changed inode
		creating
Idan Kamara destroyed: keep the filecache in sync with __dict__ (issue3335) (issue3693) (issue3743)...	r18313	repository tip rolled back to revision -1 (undo commit)
		working directory now based on revision -1
		repository tip rolled back to revision -1 (undo commit)
		working directory now based on revision -1
Idan Kamara filecache: create an entry in _filecache when __set__ is called for a missing one...	r18316
		setbeforeget:

Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* neither file exists
Siddharth Agarwal test-filecache.py: make setbeforeget test clearer...	r20040	string set externally
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* file x created
Idan Kamara filecache: create an entry in _filecache when __set__ is called for a missing one...	r18316	creating
Siddharth Agarwal test-filecache.py: make setbeforeget test clearer...	r20040	string from function
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* string set externally again
		string 2 set externally
		* file y created
		creating
		string from function
FUJIWARA Katsunori scmutil: add file object wrapper class to check ambiguity at closing...	r29995
		antiambiguity:

	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