[issue2542] tag should abort on uncommitted merge
Adrian Buehlmann
bugs at mercurial.selenic.com
Thu Dec 9 20:22:20 UTC 2010
New submission from Adrian Buehlmann <adrian at cadifra.com>:
using 6e79a3bb8c79:
create a uncommitted merge
$ hg init r4
$ cd r4
$ echo c1 > f1
$ hg ci -qAm0
$ echo foo >> f1
$ hg ci -m1
$ hg up -q 0
$ echo c2 > f2
$ hg ci -qAm2
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
now, tag aborts with a silly error message
$ hg tag t1
abort: cannot partially commit a merge (do not specify files or patterns)
[255]
and leaves a clobbered .hgtags file
$ hg sta
M f1
A .hgtags
----------
messages: 14608
nosy: abuehl
priority: bug
status: unread
title: tag should abort on uncommitted merge
____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2542>
____________________________________________________
More information about the Mercurial-devel
mailing list