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-14 22:55 Message: Logged In: YES user_id=411637 Originator: NO Good news. I just found the trick to disable the filelist checkboxes on item #3. Things are getting a little better :-) ---------------------------------------------------------------------- Comment By: TK Soh (tksoh) Date: 2008-04-14 22:09 Message: Logged In: YES user_id=411637 Originator: NO Unfortunately the window layout of the commit dialog doesn't allow much room for more meaningful visual display. It's also missing a status bar at the bottom of the window, which could perhaps be used to show the repo's merge status. So, here's the plan (short of the complete overhaul of the layout): 1. move the folder in-commit up to the repo root, so that we can display all the changes, instead of just the folder where the dialog is brought up. We will prompt user for the change of folder. 2. pre-fill the commit message with 'merge'. Hopefully this would save user some typing also, since 'merge' seem to be the usual choice. 3. disable the selection on file list. Unfortunately, PyGTK doesn't seem to support that (or at least I haven't been able to find the way), so the alternative will be to hide the checkbox column. Hopefully, these are enough to give the user a hint of what's going on. Comments or suggestion are welcome. ---------------------------------------------------------------------- Comment By: Peter Ruibal (fmoo) Date: 2008-04-14 14:48 Message: Logged In: YES user_id=2006774 Originator: YES Perhaps some kind of hovertext that says "Files to be committed are determined by merge parents (and cannot be user-selected)." Either way, the up-front check+dialog would be more than sufficient to fixing this issue, future UI improvements aside. ---------------------------------------------------------------------- Comment By: TK Soh (tksoh) Date: 2008-04-14 12:58 Message: Logged In: YES user_id=411637 Originator: NO I am kinda stuck on the GUI design in presenting the fact that the repo is being merged. I cooked up a patch to show a big "MERGED" on the background on the message window. Which may or may not be clear enough to some users. I wonder if there's a better visual cue for that. I also add the check on merge state and present the dialog to proceed with checking in all the files in the repo. The potential confusion is that if the commit dialog is brought up from a sub-folder, then only the changed files within the sub-folder will be listed. I am hoping the prompt dialog will be good enough for now. Any thought? ---------------------------------------------------------------------- Comment By: TK Soh (tksoh) Date: 2008-04-11 15:47 Message: Logged In: YES user_id=411637 Originator: NO Thanks. I tested it out. The issue turned out to be a behavioral 'fix' on Mercurial 1.0 (TortoiseHg 0.4rc1 binary is linked to latest version of Mercurial). Earlier releases of Mercurial allowed committing subset of the changes after merging, which is really a bug. ---------------------------------------------------------------------- Comment By: Peter Ruibal (fmoo) Date: 2008-04-11 14:16 Message: Logged In: YES user_id=2006774 Originator: YES Before doing anything: TortoiseHG -> settings -> global TortoiseHG -> Commit Tool -> internal Apply Close Then: 1. hg clone http://hg.ruibalweb.com/foo/ (currently has two heads) 2. explorer foo 3. right click -> TortoiseHG -> Merge Revisions 4. HG Commit... 5. Click Commit :: Dialog: Nothing Committed, Please Enter Commit Message 6. Enter Commit Message, Click Commit :: Dialog: Nothing Committed, No committable files selected 7. Select Files, Click Commit :: HgProc Dialog: *** cannot partially commit a merge (do not specify files or patterns) ---------------------------------------------------------------------- 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
