Hi Karl, Sorry for the delay, I've been really busy recently. 2008/7/2 Karl Hasselström <kha@xxxxxxxxxxx>: > I'm preparing a patch that removes all the old --undo flags, and > discovered that stg sync has an --undo flag backed by > stack.undo_refresh(). The current --undo flag restores the state of the patch before a successful sync. If the sync fails with a conflict and it needs a refresh after resolving, I think it loses the previous state of the patch and just restores to whatever it was before the refresh. > Is it OK if I remove it? "stg undo" will allow you to undo the whole > command, or, in case of conflicts, either the whole command or just > the last conflicting push. But it does not allow for undoing the last > refresh (whether it succeeded or not). I don't know how refresh is > used, so I can't really tell if "stg undo" is currently insufficient. The sync performs three operations - push, merge and refresh (if the refresh is automatic after merge, it doesn't update the backup information since it was done by merge). If merge fails, the refresh is manual after solving the conflicts. I suspect this will be recorded as a separate step for undo (BTW, is resolved take into account for undo?). -- Catalin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
