Mercurial > hg > ConflictEditor

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 36: (0) -30 -10 -8 tip
age author description
Fri, 07 Oct 2011 05:55:30 +0200 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.
Fri, 07 Oct 2011 05:41:53 +0200 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.
Fri, 07 Oct 2011 03:58:41 +0200 dirk replace the text field for the db url with a combo box that is populated from the preferences.
Tue, 20 Sep 2011 17:47:59 +0200 dirk remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences table
Tue, 20 Sep 2011 17:21:03 +0200 dirk do not blindly cast to Component ... the source of the event may be some arbitrary object (e.g. a model)
Tue, 20 Sep 2011 17:00:45 +0200 dirk Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
Tue, 20 Sep 2011 16:18:42 +0200 dirk as per Jackson recommendation, don't use Reader objects but instead use just plain input stream
Sun, 18 Sep 2011 19:06:59 +0200 dirk implement resolving the conflict
less more | rev 36: (0) -30 -10 -8 tip