[Kdiff3-user] history merge does not produce output

[Fabian S. <f...@rt...>]

Hi!

First of all, thanks for this wonderful tool! It really works great and
saves a lot of time. But unfortunately I have some trouble getting the
history merge to work.

I try to merge 3 files at once with the history merge.
But after the merge all the history is deleted and only this line is
left:

  | /**
  | @history
C | //  $Log: test.cpp $
m | //
  | */


My history has this format:

/**
@history
//  $Log: test.cpp $
//
//     /main/0.0/testbranch/xy/1   27 Oct 2006 10:39:34   sturm
//  Some comments
//
//     /main/0.0/testbranch/3   27 Oct 2006 10:39:34   sturm
//  Merge from x to y
//
//     /main/0.0/testbranch/2   20 Oct 2006 11:15:34   sturm
//  Add some bugfix...
//
*/


An though I thought the following setting should work. The match tool
also tells me a correct looking match. 

regex:

//\s*/main/(\S+)\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|
Nov|Dec) ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s
+(.*)


Sort key order: 4,3,2,5,1,6

History merge sorting: yes

Merge vcs history on merge start: yes


Any ideas why this produces the empty output?

Thanks a lot, Fabian