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
abuehl's patch tidied up and patchbombed as http://selenic.com/pipermail/mercurial-devel/2010-December/026914.html Would it be poor form to assign this bug to myself, not being on crew?
Bumping back to in-progress since patch isn't integrated yet (per http://mercurial.selenic.com/wiki/ManagingBugs)
What's crew? Have fun.
Add topic
Fixed by http://selenic.com/repo/hg/rev/ea3c93b53fdb Kevin Bullock <kbullock@ringworld.org> tag: fix uncommitted merge check and error message (issue2542) (please test the fix)
--- Bug imported by bugzilla@serpentine.com 2012-05-12 09:15 EDT --- This bug was previously known as _bug_ 2542 at http://mercurial.selenic.com/bts/issue2542