1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
!!! Must do before a merge back into HEAD !!!
* Write a kconfupdate script to convert the kconfigfile
* the diff options now have their own group
* the view options now have their own group
* the Recent Files group has been renamed to Recent Compare Files
Very important:
* Implement the rest of the interface (compare3 etc.)
* Make sure the rest works too ! Still some problems parsing some files
In descending order of importance:
* add support for handediting conflicts
* session management (should almost work)
* implement normal, ed and rcs format (normal got busted)
* merge text view GUI
* clicking in the connect widget should select a difference (tricky!)
* add support for incremental patch saving (i'll explain if anyone wants to know)
* Add support for diff3 (that is comparing 3 files at once)
Special requests:
Puetzk:
* Editing the TO pane
Falk:
* Allow only part of a change to be applied to the other file
Harlekin:
* Add search functionality, either in source, dest or both at the same time
HarryF:
* emit clicked() signal when on a diff with line number
aseigo:
* merge from dest to source instead of only from source to dest
(Workaround: swap source with destination and then apply the differences)
|
