Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
50 descendants and 50 ancestors of 1a2b919d384e4e7d
|
2011-04-30
| ||
| 01:10 | More merge conflict cases handled check-in: 118eb090c6 user: peter.spjuth@gmail.com tags: trunk | |
|
2011-04-29
| ||
| 23:53 | Improved three-way merge check-in: 2f126fd631 user: peter.spjuth@gmail.com tags: trunk | |
|
2011-04-28
| ||
| 00:55 | Added test for merge check-in: fcbb229077 user: peter.spjuth@gmail.com tags: trunk | |
| 00:21 | Code cleanup to get clean Nagelfar run check-in: 4d66d4009f user: peter.spjuth@gmail.com tags: trunk | |
|
2011-04-27
| ||
| 23:13 | Added -fine option for fine grained change chunks, useful for merging. check-in: 35053e21fc user: peter.spjuth@gmail.com tags: trunk | |
| 22:20 | Restructured code to let insertMatchingBlocks handle puting changes in the change list. check-in: bd368726a8 user: peter.spjuth@gmail.com tags: trunk | |
|
2011-04-25
| ||
| 15:58 | 3-way diff now handles basic cases. check-in: 674c783efa user: peter.spjuth@gmail.com tags: trunk | |
| 14:28 | Added infrastructure for ancestor file check-in: cc9aa5b84c user: peter.spjuth@gmail.com tags: trunk | |
|
2011-04-24
| ||
| 16:06 | Bug fix in last commit. check-in: 3b774c1269 user: peter.spjuth@gmail.com tags: trunk | |
| 15:58 | Added basic GUI for plugin selection. check-in: dbf293e7d2 user: peter.spjuth@gmail.com tags: trunk | |
|
2011-04-22
| ||
| 00:10 | Merging did not work properly if alignement was used. [Bug 9925] check-in: 20eadc24c4 user: peter.spjuth@gmail.com tags: trunk | |
|
2011-04-11
| ||
| 22:50 | Corrected test. check-in: 8a484427e6 user: peter.spjuth@gmail.com tags: trunk | |
| 22:44 | Support revisions with -review in Git. check-in: 329d49a32b user: peter.spjuth@gmail.com tags: trunk | |
| 22:22 | Support files and revisions with -review in fossil. check-in: 02a3bda086 user: peter.spjuth@gmail.com tags: trunk | |
|
2011-04-10
| ||
| 22:05 | Include struct::list to let DiffUtil fall back on pure Tcl LCS. check-in: 8cfbf113d8 user: peter.spjuth@gmail.com tags: trunk | |
|
2011-04-05
| ||
| 20:58 | Corrected email and link. check-in: 5f414288a3 user: peter.spjuth@gmail.com tags: trunk | |
| 20:35 | Added Paste Patch command. check-in: 26440fd465 user: peter.spjuth@gmail.com tags: trunk | |
| 20:07 | Bring documentation up to speed with previous changes. check-in: fe0a9b416f user: peter.spjuth@gmail.com tags: trunk | |
| 19:38 | Added -pluginlist option. check-in: 3353e42217 user: peter.spjuth@gmail.com tags: trunk | |
| 19:15 | Handle toplevels more consistenly. This gives a cleaner interface for embedding. check-in: beeec19be9 user: peter.spjuth@gmail.com tags: trunk | |
| 18:38 | Cleanup global variable usage. check-in: bf97ad3bfa user: peter.spjuth@gmail.com tags: trunk | |
|
2011-04-04
| ||
| 00:07 | Support commit in Fossil check-in: 124cbad284 user: peter.spjuth@gmail.com tags: trunk | |
|
2011-04-03
| ||
| 23:50 | Support commit in Git. check-in: 7699685063 user: peter.spjuth@gmail.com tags: trunk | |
| 23:23 | Support multiple file commit. check-in: e0dbe9361b user: peter.spjuth@gmail.com tags: trunk | |
| 22:28 | Support files list with -review check-in: 145e7aacd9 user: peter.spjuth@gmail.com tags: trunk | |
| 21:55 | Include file name in merge window title check-in: 6ef49cc3ff user: peter.spjuth@gmail.com tags: trunk | |
|
2011-03-31
| ||
| 23:36 | Preparing for release 2.5 check-in: c60cbbf4aa user: peter.spjuth@gmail.com tags: trunk | |
| 23:27 | Preparing for release 2.5 check-in: 6791ef2b87 user: peter.spjuth@gmail.com tags: trunk | |
| 23:19 | Started on change list for 2.5 check-in: 2f91931ad3 user: peter.spjuth@gmail.com tags: trunk | |
|
2011-03-30
| ||
| 23:36 | Added support for Fossil revision control. check-in: 4e65a43252 user: peter.spjuth@gmail.com tags: trunk | |
|
2011-03-29
| ||
| 19:26 | Updated paths for new machine. check-in: 2e04012d77 user: peter.spjuth@gmail.com tags: trunk | |
|
2010-11-07
| ||
| 20:20 | Merge branch 'master' into tablelist check-in: a2c892dc70 user: peter.spjuth@gmail.com tags: table-list | |
| 20:19 | Snapshot release check-in: 5203478b3e user: peter.spjuth@gmail.com tags: trunk | |
| 20:19 | Added tkdnd support. check-in: 96f07bb0f2 user: peter.spjuth@gmail.com tags: trunk | |
| 20:19 | Autodetect line endings in conflict file. Allow line ending selection in merge save. [FR 5160] Added menu bar to merge window. check-in: a2cdf2901b user: peter.spjuth@gmail.com tags: trunk | |
| 20:13 | Snapshot release check-in: cc42e32283 user: peter.spjuth@gmail.com tags: table-list | |
| 19:13 | Added tkdnd support. check-in: ae796cb610 user: peter.spjuth@gmail.com tags: table-list | |
| 18:37 | Autodetect line endings in conflict file. Allow line ending selection in merge save. [FR 5160] Added menu bar to merge window. check-in: 5995a4b5f7 user: peter.spjuth@gmail.com tags: table-list | |
|
2010-06-23
| ||
| 22:39 | Hide column separator between size/date. check-in: af38e3f3c3 user: peter.spjuth@gmail.com tags: table-list | |
| 22:34 | Make sure Restart is only scheduled once. check-in: 07f2a54ef5 user: peter.spjuth@gmail.com tags: table-list | |
| 21:28 | Removed Name columns from dir diff. check-in: 0f4c63dfb2 user: peter.spjuth@gmail.com tags: table-list | |
| 21:23 | Remade hidden columns into row attributes. check-in: 79b9aabf5f user: peter.spjuth@gmail.com tags: table-list | |
| 20:34 | Trying out to use tablelist instead of ttk::treeview for dir diff. check-in: 17bdab9a27 user: peter.spjuth@gmail.com tags: table-list | |
| 20:33 | Support -noempty from DiffUtil. check-in: ab1da68c44 user: peter.spjuth@gmail.com tags: trunk | |
| 20:31 | Get DiffUtil from new location. check-in: fab6204614 user: peter.spjuth@gmail.com tags: trunk | |
|
2010-06-07
| ||
| 14:57 | Only list each plugin once. check-in: 122f495f11 user: peter.spjuth@gmail.com tags: trunk | |
|
2010-04-28
| ||
| 08:10 | Added some tests for new print command line options. check-in: 6f44793373 user: peter.spjuth@gmail.com tags: trunk | |
|
2010-04-27
| ||
| 22:10 | Added command line options to control PDF options. check-in: a0e927608f user: peter.spjuth@gmail.com tags: trunk | |
| 21:31 | Removed support for Postscript output. check-in: d83662d1cc user: peter.spjuth@gmail.com tags: trunk | |
| 21:06 | Moved packages pstools and psballoon into GIT repository. check-in: 51939a3dd4 user: peter.spjuth@gmail.com tags: trunk | |
| 20:30 | Cleanup after GIT import check-in: 1a2b919d38 user: peter.spjuth@gmail.com tags: trunk | |
| 19:29 | Update path to kit. check-in: c19a334194 user: peter tags: trunk | |
| 19:29 | Do git add after conflict merge of a git file. check-in: 02a22eea17 user: peter tags: trunk | |
|
2010-02-13
| ||
| 21:48 | Better defaults for PDF colors. check-in: 2249caf67e user: peter tags: trunk | |
| 21:36 | Added colours to PDF dialog. check-in: add9339d4f user: peter tags: trunk | |
| 21:33 | Added a proc to support git add check-in: 87ace8d1da user: peter tags: trunk | |
|
2009-11-02
| ||
| 20:55 | Polish check-in: ad0a47e0b1 user: peter tags: trunk | |
| 20:52 | Detect and display annotation in patches. E.g. when using -p with diff. check-in: 9313711f6a user: peter tags: trunk | |
|
2009-10-16
| ||
| 22:19 | Return in rev field does a redo diff. [FR 4649] Allow zero lines of context to only show diffs. check-in: 9bb4874b85 user: peter tags: trunk | |
|
2009-02-12
| ||
| 19:32 | Perforce support check-in: 5202d19e40 user: peter tags: trunk | |
| 19:11 | More 8.5 features used: lassign instead of foreach. lrepeat+lreverse Math commands for some expressions. check-in: ace521ad0a user: peter tags: trunk | |
| 18:31 | Require 8.5. Use argument expansion instead of eval. check-in: eaa675fac3 user: peter tags: trunk | |
| 15:26 | Allow stepping down in directory diff check-in: 2bd38e69fc user: peter tags: trunk | |
|
2009-01-23
| ||
| 22:36 | Better doc of plugins. Allow dump of plugins check-in: 4251e290a3 user: peter tags: trunk | |
| 21:22 | Don't save unchanged preferences to prefs file. check-in: 2c5e0366e6 user: peter tags: trunk | |
|
2009-01-08
| ||
| 00:28 | Improved docs check-in: 8407a44d69 user: peter tags: trunk | |
| 00:13 | Added backslash plugin and started on plugin doc check-in: 3ad2080098 user: peter tags: trunk | |
|
2009-01-07
| ||
| 23:16 | Release 2.4 check-in: 9d2ca9030d user: peter tags: trunk | |
| 23:10 | Test subversion revision parsing check-in: c99cfccaba user: peter tags: trunk | |
| 23:09 | Better interpretation of negative SVN versions check-in: 3c929eb1df user: peter tags: trunk | |
| 23:08 | Syntax fix check-in: af015a3a7b user: peter tags: trunk | |
|
2009-01-04
| ||
| 17:34 | Make sure capture only starts on diff. check-in: 9471daedb0 user: peter tags: trunk | |
|
2008-11-10
| ||
| 19:16 | Include twapi in windows executable. check-in: 092aae7ffb user: peter tags: trunk | |
| 19:16 | Verision increase check-in: 8991295b2a user: peter tags: trunk | |
| 18:46 | New tests check-in: ad2669dd7d user: peter tags: trunk | |
| 18:26 | Improved patch parsing. check-in: 1ff232f13d user: peter tags: trunk | |
|
2008-11-06
| ||
| 07:01 | Handle both rev and plugin at the same time. check-in: 0822f77f17 user: peter tags: trunk | |
| 06:58 | More descriptive names. Moved cleanup to this file. check-in: b22e115d60 user: peter tags: trunk | |
| 06:57 | Added Capture for Windows. check-in: 992b86689a user: peter tags: trunk | |
| 06:52 | Put height on the canvas to allow window to be small. check-in: 2809cdf7cc user: peter tags: trunk | |
|
2008-09-23
| ||
| 20:32 | Corrected dependency check-in: 083132e5ee user: peter tags: trunk | |
| 20:32 | Added entryX. check-in: 68c3acf4b9 user: peter tags: trunk | |
| 20:32 | Plugin must be a file check-in: 17a8c2f764 user: peter tags: trunk | |
| 19:38 | Added commit for Subversion. Added log view for CVS and Subversion. check-in: b97c4ac09f user: peter tags: trunk | |
| 19:37 | Added log button for version control. check-in: 394d532897 user: peter tags: trunk | |
| 18:48 | Do not parse GIT revisions. check-in: 61849504cd user: peter tags: trunk | |
|
2008-05-23
| ||
| 04:59 | More plugin examples check-in: c0f250b652 user: peter tags: trunk | |
| 04:50 | Push Prefs into plugin check-in: b5abba5fa8 user: peter tags: trunk | |
|
2008-05-22
| ||
| 20:06 | Added plugins check-in: 35db83fb5f user: peter tags: trunk | |
|
2008-05-11
| ||
| 16:09 | Clear merge file when opening new diff. check-in: eeed6d7805 user: peter tags: trunk | |
|
2008-04-09
| ||
| 16:53 | Added color option for unchanged text. check-in: 54d1614c75 user: peter tags: trunk | |
| 05:44 | Support prefs for PDF colors. Added paper size selection to PDF print dialog. check-in: 482ac739dd user: peter tags: trunk | |
| 05:41 | Added prefs for PDF colors. check-in: 6c64417f08 user: peter tags: trunk | |
|
2008-04-08
| ||
| 16:56 | Added 2.4 changes. check-in: 89b593387a user: peter tags: trunk | |
| 16:54 | Removed dirdiff that was already done. check-in: bbd712ff91 user: peter tags: trunk | |
| 16:52 | Include side context menu if a file is only on one side. check-in: 8597927f53 user: peter tags: trunk | |
| 16:42 | Support -context with -review for CVS. check-in: 20e5aa713f user: peter tags: trunk | |
| 16:41 | Use lighter colours in PDF check-in: 45bef756eb user: peter tags: trunk | |
|
2008-03-07
| ||
| 07:17 | Added -review check-in: ef619cf1c2 user: peter tags: trunk | |
|
2008-03-06
| ||
| 07:26 | Added -review flag. check-in: 8392c70796 user: peter tags: trunk | |
|
2008-03-05
| ||
| 18:43 | Cannot wrap ttk::entry in the way it was done. check-in: e2d6d6fd24 user: peter tags: trunk | |