sapling/mercurial
Alexis S. L. Carvalho af51350c6e 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.
2008-03-14 11:01:31 -05:00
..
hgweb hgweb_mod: add branch helper functions to use in templates 2008-03-13 23:45:35 +01:00
__init__.py Add back links from file revisions to changeset revisions 2005-05-03 13:16:10 -08:00
ancestor.py white space and line break cleanups 2006-11-17 08:06:54 +01:00
archival.py Expand import * to allow Pyflakes to find problems 2008-03-06 22:23:26 +01:00
base85.c python2.5 PyArg_ParseTuple fix 2006-10-12 14:04:11 -03:00
bdiff.c fix calloc(0, ...) issue 2007-10-23 10:39:24 +00:00
bundlerepo.py revlog: report node and file when lookup fails 2008-03-11 17:42:29 -05:00
byterange.py send conservatively capitalized HTTP headers 2008-01-23 14:28:25 +01:00
changegroup.py improve changegroup.readbundle(), use it in hgweb 2008-02-21 17:02:28 +01:00
changelog.py make sure not to reuse an existing append-file from a previous failed pull 2008-03-14 21:35:49 +01:00
cmdutil.py Fix issue995 (copy --after and symlinks pointing to a directory) 2008-03-14 10:32:19 -03:00
commands.py hgweb: clarify which address and port can/cannot be bound at startup (bug 769) 2008-03-10 19:25:34 +00:00
context.py revlog: report node and file when lookup fails 2008-03-11 17:42:29 -05:00
demandimport.py demandimport: handling new relative imports 2008-01-16 19:14:54 +03:30
diffhelpers.c Handle patches with misformatted empty lines 2007-11-01 17:15:50 -05:00
dirstate.py dirstate: ignore mode changes if the fs does not supports the exec bit 2008-03-14 09:56:58 -03:00
dispatch.py Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg 2008-03-06 22:51:16 +01:00
extensions.py Remove unused imports 2008-03-06 22:23:41 +01:00
fancyopts.py transform a bunch of print statements to appropriate ui calls 2008-01-18 10:48:25 -06:00
filelog.py Remove unused imports 2008-03-06 22:23:41 +01:00
filemerge.py Remove unused imports 2008-03-06 22:23:41 +01:00
hbisect.py Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg 2008-03-06 22:51:16 +01:00
help.py Document log date ranges and mention 'hg help dates' for all commands (issue998) 2008-02-22 21:18:48 +01:00
hg.py Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg 2008-03-06 22:51:16 +01:00
hook.py hook.py: fix redirections introduced by 59a5ced38398 2008-03-14 21:57:46 -03:00
httprangereader.py update copyrights. 2006-08-12 12:30:02 -07:00
httprepo.py Remove unused imports 2008-03-06 22:23:41 +01:00
i18n.py Enable gettext translations 2006-12-14 17:32:00 -06:00
ignore.py ignore: fix up comment parsing 2007-12-10 10:26:42 -06:00
keepalive.py merge with crew-stable 2008-02-03 21:47:07 -02:00
localrepo.py localrepo.commit: normalize commit message even for rawcommit. 2008-03-14 09:56:58 -03:00
lock.py Use format string for lockname again (was changed by cb157328a155) 2007-07-21 10:39:42 +02:00
lsprof.py Remove unused imports 2008-03-06 22:23:41 +01:00
mail.py templater: move email function to util 2008-01-31 14:44:19 -06:00
manifest.py Remove unused imports 2008-03-06 22:23:41 +01:00
mdiff.py diff: don't show function name by default 2008-01-16 11:14:24 -06:00
merge.py merge: notice uncommited copies (issue1000) 2008-03-14 11:01:31 -05:00
mpatch.c mpatch: Define Py_ssize_t for old pythons and use it instead of ssize_t. 2007-10-12 11:46:49 +09:00
node.py manifest: speed up creation of the manifestdict 2007-07-23 20:44:08 -05:00
osutil.c osutil: use fdopendir instead of dirfd 2007-10-15 12:57:01 -07:00
osutil.py Add osutil module, containing a listdir function. 2007-10-05 15:01:06 -07:00
patch.py Expand import * to allow Pyflakes to find problems 2008-03-06 22:23:26 +01:00
remoterepo.py update copyrights. 2006-08-12 12:30:02 -07:00
repair.py Expand import * to allow Pyflakes to find problems 2008-03-06 22:23:26 +01:00
repo.py import gettext since '_' is used 2007-10-11 16:26:14 +02:00
revlog.py revlog.py: remove extra close() 2008-03-14 20:01:50 -03:00
simplemerge.py Remove unused imports 2008-03-06 22:23:41 +01:00
sshrepo.py Remove unused imports 2008-03-06 22:23:41 +01:00
sshserver.py Expand import * to allow Pyflakes to find problems 2008-03-06 22:23:26 +01:00
statichttprepo.py Remove unused imports 2008-03-06 22:23:41 +01:00
streamclone.py Remove unused imports 2008-03-06 22:23:41 +01:00
strutil.py fix issue 322. 2006-08-18 21:03:29 -07:00
templatefilters.py dates: improve timezone handling 2008-03-11 17:42:41 -05:00
templater.py templates: move filters to their own module 2008-01-31 14:44:19 -06:00
transaction.py make the journal/undo files from transactions inherit the mode from .hg/store 2008-02-09 18:38:54 -02:00
ui.py Ensure that absolutized paths from hgrc do not contain ../ segments. 2008-01-08 22:40:51 -05:00
util_win32.py Add missing import of sys 2008-03-06 22:23:41 +01:00
util.py Check for patches repo with os.path.isdir not os.path.exists 2008-03-02 08:51:02 -08:00
verify.py Expand import * to allow Pyflakes to find problems 2008-03-06 22:23:26 +01:00
version.py Make mercurial easy installable 2008-03-12 21:59:22 +01:00