James Westby wrote: > > Hi, > > My first reaction would be to merge the fix in to mainline, and then > merge mainline in to newfeat. Does that suit you? > That's what I would do to at first. But in that case, you have several times the same log when you merge back the new feature in the mainline, no ? David