Mercurial > hg
comparison hgext/fetch.py @ 6385:0d4e068e9e52
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 |
comparison
equal
deleted
inserted
replaced
6384:8bc876e03143 | 6385:0d4e068e9e52 |
---|---|
65 message = (cmdutil.logmessage(opts) or | 65 message = (cmdutil.logmessage(opts) or |
66 (_('Automated merge with %s') % | 66 (_('Automated merge with %s') % |
67 util.removeauth(other.url()))) | 67 util.removeauth(other.url()))) |
68 force_editor = opts.get('force_editor') or opts.get('edit') | 68 force_editor = opts.get('force_editor') or opts.get('edit') |
69 n = repo.commit(mod + add + rem, message, | 69 n = repo.commit(mod + add + rem, message, |
70 opts['user'], opts['date'], | 70 opts['user'], opts['date'], force=True, |
71 force_editor=force_editor) | 71 force_editor=force_editor) |
72 ui.status(_('new changeset %d:%s merges remote changes ' | 72 ui.status(_('new changeset %d:%s merges remote changes ' |
73 'with local\n') % (repo.changelog.rev(n), | 73 'with local\n') % (repo.changelog.rev(n), |
74 short(n))) | 74 short(n))) |
75 | 75 |