log
graph
tags
bookmarks
branches
changeset
browse
zip
help
Mercurial
>
hg
>
ConflictEditor
log
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
less
more
| rev 42:
(0)
-15
tip
age
author
description
2012-01-05
dirk
bring up a message dialog if the selected database did not contain any conflicts
default
tip
2011-10-10
Dirk Olmes
add a site
2011-10-09
Dirk Olmes
remove commented stuff
2011-10-09
Dirk Olmes
add a module that generates a webstart package
2011-10-09
Dirk Olmes
add a toplevel pom, make this a reactor build
2011-10-07
dirk
add a comment why we discard the index here
2011-10-07
dirk
do not use the selection index in conflict list from the event, get it from the list instead. If the selection is cleared in the list, the event will report a wrong index.
2011-10-07
dirk
do not use a custom combo box model, instead fill a default one from preferences and attach an action listener to the combo that ensures that yet unknown database URLs will be stored in preferences.
2011-10-07
dirk
replace the text field for the db url with a combo box that is populated from the preferences.
2011-09-20
dirk
remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences table
2011-09-20
dirk
do not blindly cast to Component ... the source of the event may be some arbitrary object (e.g. a model)
2011-09-20
dirk
Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
2011-09-20
dirk
as per Jackson recommendation, don't use Reader objects but instead use just plain input stream
2011-09-18
dirk
implement resolving the conflict
2011-09-18
dirk
fix a bug with selection in the differences table
less
more
| rev 42:
(0)
-15
tip