Hi all, After you merge in changes from a different branch, but before you check in the merge, is there any way to back out the merge? "fossil revert" undoes the changes but leaves the files "edited", although with no changes.
Alternately, is there a way to preview what a merge will do without actually doing the merge? Here's what happens when I try to revert a merge: $ fossil changes $ fossil merge dev2 UPDATE rb $ fossil diff Index: rb =================================================================== --- rb +++ rb @@ -1,3 +1,3 @@ -the line 1 +that line 1 line 2 line 3 $ fossil revert REVERTED: rb "fossil undo" is available to undo the changes shown above. $ fossil changes EDITED rb $ fossil diff Index: rb =================================================================== --- rb +++ rb $ This is fossil version [4a094f46ad] 2010-11-01 18:52:37 UTC Thanks, -J _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
