In my company we use TkCVS for our all day management
of source code via CVS. And with this we also use
TkDiff for merging changes/conflicts and so on.
Since we're maintaining many differen branches of the
same software and the whole thing evoles realy fast
there's a lot of merging (often more than 1000 diffs
TkDiff already has key bindings to ease up merging a
little. But confronted with this huge amount of merging
me and my colleagues had to face eay day
I decided that there was the need for a faster way of
With this in mind a added some additional key bindings
to TkDiff and created a feature called 'Rocker-Merging'.
With it you simply press Tab in one of the text widgets
and then start merging by using C-Left, C-Right, C-Up,
C-Down. This little improvement found a great adoption
in my company and now allmost all of us use it.
Since TkCVS is open source and GPL'ed I thought that
maybe other people would like it too and I decided to
create this patch and send it out to the public.
If you find it usefull maybe you can include my changes
in the next TkDiff version (this one is for TkCVS 8.0.3
/ TkDiff 4.1.2 but I have a patch for TkCVS 7.2.5 too).
Greetings René Köcher
Log in to post a comment.