Mercurial > hg
view templates/search.tmpl @ 6268:7e4f66fe964b
merge: notice uncommited copies (issue1000)
As mentioned in msg5349 in issue988, "hg update" doesn't take into account
uncommitted copies. To reproduce:
----------------
hg init repo
cd repo
touch foo
hg ci -Am 'add foo'
echo >> foo
hg ci -m 'change foo'
hg up -C 0
hg mv foo bar
HGMERGE=false thg --debug -y update
--------------------------
A similar problem happens with hg merge --force.
I'm attaching a possible patch.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 14 Mar 2008 11:01:31 -0500 |
parents | 673d8a6bc709 |
children | 7f58dec6aeb7 |
line wrap: on
line source
#header# <title>#repo|escape#: searching for #query|escape#</title> </head> <body> <div class="buttons"> <a href="#url#log{sessionvars%urlparameter}">changelog</a> <a href="#url#shortlog{sessionvars%urlparameter}">shortlog</a> <a href="#url#tags{sessionvars%urlparameter}">tags</a> <a href="#url#file/#node|short#{sessionvars%urlparameter}">files</a> #archives%archiveentry# </div> <h2>searching for #query|escape#</h2> <form> {sessionvars%hiddenformentry} <p> search: <input name="rev" type="text" width="30" value="#query|escape#"> </p> </form> #entries# <form> {sessionvars%hiddenformentry} <p> search: <input name="rev" type="text" width="30" value="#query|escape#"> </p> </form> #footer#