Many fixes across the system, mostly to account for bug fixes in Inte…

…lliJ 15, but also to fix some lingering issues that those IntelliJ bugs were masking.
groboclown · Aug 11, 2015 · 8b0984d · 8b0984d
1 parent dfe0a5b
commit 8b0984d
Show file tree

Hide file tree

Showing 10 changed files with 690 additions and 662 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,12 +5,21 @@
 
 ### Overview
 
+* Added user preference (not available through UI yet) that allows selecting whether a copy
+  command means an integrate.
+* Started work on adding in the rollback on history view.
 * Bug fixes.
 
 ### Details
 
+* Added user preference (not available through UI yet) that allows selecting whether a copy
+  command means an integrate.
+    * UI will be available by v0.7.
 * Bug fixes.
     * Move operations could not find the Perforce version of the locally moved file (#62).
+      This also affected the copy operation.
+    * Rewrote how the IDEA changelists sync up with the Perforce changelists.  It should now
+      be more accurate and eliminate some of the null mappings that occurred before.
 
 
 ## ::v0.6.5::