Mercurial > hg

diff hgext/fetch.py @ 6385:0d4e068e9e52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 24 Mar 2008 15:36:56 -0700
parents bd61e44eb2cc
children 53465a7464e2
line wrap: on
line diff
--- a/hgext/fetch.py	Mon Mar 24 22:49:33 2008 +0100
+++ b/hgext/fetch.py	Mon Mar 24 15:36:56 2008 -0700
@@ -67,7 +67,7 @@
                         util.removeauth(other.url())))
             force_editor = opts.get('force_editor') or opts.get('edit')
             n = repo.commit(mod + add + rem, message,
-                            opts['user'], opts['date'],
+                            opts['user'], opts['date'], force=True,
                             force_editor=force_editor)
             ui.status(_('new changeset %d:%s merges remote changes '
                         'with local\n') % (repo.changelog.rev(n),