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

subrepo: handle svn tracked/unknown directory collisions...

subrepo: handle svn tracked/unknown directory collisions This happens more often than expected. Say you have an svn subrepository with python code. Python would have generated unknown .pyc files. Now, you rebase this setup on a revision where a directory containing python code does not exist. Subversion is first asked to remove this directory when updating, but will not because it contains untracked items. Then it will have to bring back the directory after the merge but will fail because it now collides with an untracked directory. Using --force is not very elegant and only works with svn >= 1.5 but the only alternative I can think of is to write our own purge command for subversion.

Steven Stallion - - Load All Authors

File last commit:

r13964:616ad3f6 default


                r14050:9e8a9d45

stable

Download file

             manifest.tmpl
        
                    58 lines
            
             | 1.7 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / manifest.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      <title>{repo|escape}: {node|short} {path|escape}</title>

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

      <a href="http://mercurial.selenic.com/">

      <img src="{staticurl}hglogo.png" alt="mercurial" /></a>

      </div>

      <ul>

      <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>

      <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>

      <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>

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

              r9999
            
      <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>

      </ul>

      <ul>

      <li><a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a></li>

      <li class="active">browse</li>

      </ul>

      <ul>

      {archives%archiveentry}

      </ul>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <ul>

       <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>

      </ul>

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

              r9999
            
      </div>

      <div class="main">

      <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>

      <h3>directory {path|escape} @ {rev}:{node|short} {tags%changelogtag}</h3>

      <form class="search" action="{url}log">

      {sessionvars%hiddenformentry}

      <p><input name="rev" id="search1" type="text" size="30" /></p>

      <div id="hint">find changesets by author, revision,

      files, or words in the commit message</div>

      </form>

      <table class="bigtable">

      <tr>

        <th class="name">name</th>

        <th class="size">size</th>

        <th class="permissions">permissions</th>

      </tr>

      <tr class="fileline parity{upparity}">

        <td class="name"><a href="{url}file/{node|short}{up|urlescape}{sessionvars%urlparameter}">[up]</a></td>

        <td class="size"></td>

        <td class="permissions">drwxr-xr-x</td>

      </tr>

      {dentries%direntry}

      {fentries%fileentry}

      </table>

      </div>

      </div>

      {footer}

	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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: {node\|short} {path\|escape}</title>
		</head>
		<body>

		<div class="container">
		<div class="menu">
		<div class="logo">
		<a href="http://mercurial.selenic.com/">
		<img src="{staticurl}hglogo.png" alt="mercurial" /></a>
		</div>
		<ul>
		<li><a href="{url}shortlog/{node\|short}{sessionvars%urlparameter}">log</a></li>
		<li><a href="{url}graph/{node\|short}{sessionvars%urlparameter}">graph</a></li>
		<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
		</ul>
		<ul>
		<li><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">changeset</a></li>
		<li class="active">browse</li>
		</ul>
		<ul>
		{archives%archiveentry}
		</ul>
Augie Fackler web: add a help view for getting hg help output	r12666	<ul>
		<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
		</ul>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="main">
		<h2><a href="{url}{sessionvars%urlparameter}">{repo\|escape}</a></h2>
		<h3>directory {path\|escape} @ {rev}:{node\|short} {tags%changelogtag}</h3>

		<form class="search" action="{url}log">
		{sessionvars%hiddenformentry}
		<p><input name="rev" id="search1" type="text" size="30" /></p>
		<div id="hint">find changesets by author, revision,
		files, or words in the commit message</div>
		</form>

		<table class="bigtable">
		<tr>
		<th class="name">name</th>
		<th class="size">size</th>
		<th class="permissions">permissions</th>
		</tr>
		<tr class="fileline parity{upparity}">
		<td class="name"><a href="{url}file/{node\|short}{up\|urlescape}{sessionvars%urlparameter}">[up]</a></td>
		<td class="size"></td>
		<td class="permissions">drwxr-xr-x</td>
		</tr>
		{dentries%direntry}
		{fentries%fileentry}
		</table>
		</div>
		</div>
		{footer}