On Mon, Jan 19, 2009 at 5:34 AM, Steve Borho <[email protected]> wrote: > On Sun, Jan 18, 2009 at 11:15 PM, TK Soh <[email protected]> wrote: >> >> On Mon, Jan 19, 2009 at 1:18 AM, Steve Borho <[email protected]> wrote: >> > Yes, I saw that you did start work in this direction. The merge >> > workflow, >> > where you're supposed to commit the entire workspace at once, didn't >> > match well >> > with the new record/shelve features, so I made the merge case more >> > "special". It >> >> I thought record/shelve are not permitted on merged repo, which >> requires all changes to be committed by Hg. No? > > Yes, so I had to disable chunk selection entirely when there are two > parents. It uses > an entirely separate process to show merge diffs. It actually shows diffs > to both parents, > similar to the way Qct did it.
I tried to play it the shelving support a bit more, but seemed to get more confused each time. Do you think you can explain the functions and the visual representations of shelve/record support? I also have a strange feel about the strikethrough when double-click on a diff block. I original want to find a way to present the diffs that are shelved away without having to resort to a separate interface, and strikethrough seems to fit this purpose quite well. ------------------------------------------------------------------------------ This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
