On Thu, Sep 17, 2009 at 2:45 AM, Mads Kiilerich <[email protected]> wrote: > On 09/17/2009 05:32 AM, Steve Borho wrote: >>> >>> c) combining changelog and synchronize tools >>> >> >> $2.00 This looks like it will be my next task. I have some >> interesting ideas about how to visualize incoming and outgoing >> changes. >> > > A colleague (and thus also me) had a (usability) problem some days ago which > could be related to this: > > After synchronizing/pulling he was told that he had two heads. IIRC it > wasn't obvious in the UI which two heads it was. I assume that integrating > with the changelog tool is one way to make it more obvious. In this > situation it would however be more interesting to see just the heads/leaves > instead of the whole log/tree. > > The main usability problem was however to find out how to merge the two > heads. We found no obvious way to do it, and we ended up doing it by > locating one of the heads in the changelog tool and selecting merge in the > right-click menu. It would be really nice if the gui somehow guided the user > to do a merge after a pull has given an extra head. > > Perhaps you can have this usecase in mind while designing the merged tool.
The changelog tool on the default branch has a new filter bar that makes it much easier to do things like finding heads (just click the heads button). Newly pulled heads would show up as green. We _could_ check after every pull if a new head was added, and offer to start the merge process, but this is somewhat problematic. This may lead the user to merge heads from different branches if they aren't paying attention. And if they did not have the previous tip checked out the merge would most likely have the wrong parents. My thinking is that it's best to have the user explicitly start the merge, though we can probably do a better job of making that easier. I find myself coming around to the point of view of issue #496. The user should be able to select any two revisions and select 'merge with' from the context menu. We can verify the repo is clean and then update to p0 and merge with p1. -- Steve Borho ------------------------------------------------------------------------------ Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now! http://p.sf.net/sfu/devconf _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
