Daniel Dehennin <[EMAIL PROTECTED]> writes: > After a merge I use to hit C to add the "merge from XXXX" log message > and commit. > > With the latest 'mainline' dvc I got this error message: > > dvc-log-edit: Must have a DVC diff or status buffer before calling > dvc-log-edit
That is a problem that I also noticed. Stephen Leake introduced this check. I also use this flow from the bookmarkbuffer: M x - to merge c - start a commit C-c C-RET - Insert the merged from text C-c C-d - Show the diff add log message C-c C-c - commit Now we have to open a status buffer or a diff buffer to start a commit One way to solve this problem would be to show the diff first and add a a way to open the log-edit buffer after the diff is shown. Any suggestions about the best way to do this? Or would it be possible to disable the check when called from the bookmark buffer? What would be the drawback? I used it before without problems. Stefan. _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
