Author: ericwa
Date: Thu Nov 21 09:39:07 2013
New Revision: 9652
URL: http://svn.gna.org/viewcvs/etoile?rev=9652&view=rev
Log:
Some tweaks to COUndoTrack based on feedback from playing with ProjectDemo.
- when undoing/redoing, the head revision is only updated if it diverges, so
you can do edit x3, undo x3, step forward x3 (this didn't work previously)
- disable -[COUndoTrack redoNode:]
- Selective undo on COUndoTrack (-undoNode:) now makes a regular commit which
is pushed on the undo stack, so you can undo a selective undo with Cmd+Z.
- auto-resolve merge conflicts in COCommandSetCurrentVersionForBranch
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/EWUndoWindowController.m
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/Undo.xib
trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestHistoryTrack.m
trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestUndo.m
trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestUndoStackFailedNavigation.m
trunk/Etoile/Frameworks/CoreObject/Undo/COCommandSetCurrentVersionForBranch.m
trunk/Etoile/Frameworks/CoreObject/Undo/COUndoTrack.m
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
