upstream/mercurial-mirror Files · mercurial/templates/paper/shortlogentry.tmpl

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

av6 - - Load All Authors

File last commit:

r35055:9acc0360 default


                r38817:bb54db4a

@96 default

Download file

             shortlogentry.tmpl
        
                    8 lines
            
             | 258 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / shortlogentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Alexander Plavin
    
hgweb: make stripes in log and search with CSS

              r19452
            
       <tr>

        Brodie Rao
    
hgweb: fix dynamic date calculation not working under Safari...

              r15375
            
        <td class="age">{date|rfc822date}</td>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
        <td class="author">{author|person}</td>

        Anton Shestakov
    
hgweb: split some long lines in paper, gitweb and monoblue styles...

              r25108
            
        <td class="description">

         <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>

        av6
    
hgweb: move changeset "tags" to a template in map file (paper and coal)...

              r35055
            
         {alltags}

        Anton Shestakov
    
hgweb: split some long lines in paper, gitweb and monoblue styles...

              r25108
            
        </td>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
       </tr>

	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

Alexander Plavin hgweb: make stripes in log and search with CSS	r19452	<tr>
Brodie Rao hgweb: fix dynamic date calculation not working under Safari...	r15375	<td class="age">{date\|rfc822date}</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<td class="author">{author\|person}</td>
Anton Shestakov hgweb: split some long lines in paper, gitweb and monoblue styles...	r25108	<td class="description">
		<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{desc\|strip\|firstline\|escape\|nonempty}</a>
av6 hgweb: move changeset "tags" to a template in map file (paper and coal)...	r35055	{alltags}
Anton Shestakov hgweb: split some long lines in paper, gitweb and monoblue styles...	r25108	</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>