Bugs item #1939794, was opened at 2008-04-11 08:03 Message generated for change (Comment added) made by tksoh You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=968354&aid=1939794&group_id=199155
Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: dialogs Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Peter Ruibal (fmoo) Assigned to: Nobody/Anonymous (nobody) Summary: Unable to Merge changes with builtin commit UI Initial Comment: I seem to have gotten myself into a place where I can't commit my merge with the existing UI. Steps to Reproduce: 1. Create a changeset, A, with files, F1, F2 2. Create a changeset from A, B1, where F1 is modified 3. Checkout A. Modify F2 and F3, and commit a changeset, B2, only including the modified F2. 4. Merge B1 and B2 with the visual merge tool 5a. Commit With Comment says "No committable files selected" 5b. Commit Without Comment says "Cannot partially commit a merge (do not specify files or patterns) If I change my commit tool to qct I can commit just fine. ---------------------------------------------------------------------- >Comment By: TK Soh (tksoh) Date: 2008-04-11 09:14 Message: Logged In: YES user_id=411637 Originator: NO Just to make sure we are really in synch here, can you please help post your test repo? Of course I could go make up the repo myself. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=968354&aid=1939794&group_id=199155 ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
