On Sun, Feb 22, 2009 at 1:17 PM, Олег Тазетдинов <ton1...@mail.ru> wrote: > Currently thg enables 'Merge with' context menu in log window only when two > heads are available. > Sometimes this is too restrictive. Suppose we have two branches. As soon as > we merge them we will get a single head. But it is quite common I think to > merge any two revisions from those branches and get a new head after a commit. > This is especially useful for long-living named branches when most of the > merges is from, say, branch B to branch A but occasionally the two branches > need to get in synch, so a merge is necessary that should be committed to > both branches. > Mercurial does not prohibit this kind of operation, any two revisitions can > be merged as far as they are not direct ancestor and child.
I think I'll remove the two head check in the changelog browser. That will allow you to merge any two arbitrary revisions. Changes to the shell context menu will have to wait for the next release. -- Steve ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ Tortoisehg-discuss mailing list Tortoisehg-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
