upstream/mercurial-mirror Files · mercurial/templates/json/graph.tmpl

repoview: pin revisions for `local` and `other` when a merge is active...

repoview: pin revisions for `local` and `other` when a merge is active I've hit this a couple of times, where pulling with a dirty `wdir` obsoletes `p1` and updating to the successor results in merge conflicts. The problem was resolving them failed immediately, complaining that the old checkout was filtered. The change in `test-rebase-obsolete.t` is because there's an outstanding merge conflict in a rebase operation. The summary prompt to merge seems incorrect for this scenario, but that's an existing issue. Differential Revision: https://phab.mercurial-scm.org/D8980

av6 - - Load All Authors

File last commit:

r35390:b963750b default


                r45972:aaeccdb6

stable

Download file

             graph.tmpl
        
                    5 lines
            
             | 117 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / json / graph.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      \{

        "node": {node|json},

        "changeset_count": {changesets|json},

        "changesets": [{join(nodes%graphentry, ", ")}]

      }

	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

				\{
				"node": {node\|json},
				"changeset_count": {changesets\|json},
				"changesets": [{join(nodes%graphentry, ", ")}]
				}