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.
#header#
<title>#repo|escape#: shortlog</title>
<link rel="alternate" type="application/atom+xml"
href="#url#atom-log" title="Atom feed for #repo|escape#">
<link rel="alternate" type="application/rss+xml"
href="#url#rss-log" title="RSS feed for #repo|escape#">
</head>
<body>
<div class="buttons">
<a href="#url#log/#rev#{sessionvars%urlparameter}">changelog</a>
<a href="#url#tags{sessionvars%urlparameter}">tags</a>
<a href="#url#file/#node|short#/{sessionvars%urlparameter}">files</a>
#archives%archiveentry#
<a type="application/rss+xml" href="#url#rss-log">rss</a>
<a type="application/rss+xml" href="#url#atom-log" title="Atom feed for #repo|escape#">atom</a>
</div>
<h2>shortlog for #repo|escape#</h2>
<form action="#url#log">
{sessionvars%hiddenformentry}
<p>
<label for="search1">search:</label>
<input name="rev" id="search1" type="text" size="30">
navigate: <small class="navigate">#changenav%navshortentry#</small>
</p>
</form>
#entries%shortlogentry#
<form action="#url#log">
{sessionvars%hiddenformentry}
<p>
<label for="search2">search:</label>
<input name="rev" id="search2" type="text" size="30">
navigate: <small class="navigate">#changenav%navshortentry#</small>
</p>
</form>
#footer#