On Tue, Jan 19, 2010 at 10:23 AM, Wagner Bruna <wagner.bruna+...@gmail.com> wrote: > Hello, > > I tried to use a backward update to transfer a change between named branches, > but thg doesn't allow a merge on update if the destination is on another named > branch - even if it's an ancestor of the current revision. > > I see there's an explicit test for that at: > > http://bitbucket.org/tortoisehg/stable/src/319fa452b1f4/tortoisehg/hgtk/update.py#cl-212
I can't speak to the exact logic, but the intent was to mirror Mercurial's internal logic and disallow any backwards merge that would cause Mercurial to abort. Did you try the update from the command line to see if hg was ok with it? -- Steve Borho ------------------------------------------------------------------------------ Throughout its 18-year history, RSA Conference consistently attracts the world's best and brightest in the field, creating opportunities for Conference attendees to learn about information security's most important issues through interactions with peers, luminaries and emerging and established companies. http://p.sf.net/sfu/rsaconf-dev2dev _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
