From 6e376c8097d75b6e63a7e52332a721f7928992e9 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Mon, 2 Nov 2015 15:01:58 +0100
Subject: STM: fix undo into a branch containing side effects

The "master" label used to be reset to the wrong id
---
 stm/stm.ml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/stm/stm.ml b/stm/stm.ml
index a6a64f2094..89034706a4 100644
--- a/stm/stm.ml
+++ b/stm/stm.ml
@@ -2333,7 +2333,9 @@ let edit_at id =
   let rec master_for_br root tip =
       if Stateid.equal tip Stateid.initial then tip else
       match VCS.visit tip with
-      | { step = (`Fork _ | `Sideff _ | `Qed _) } -> tip
+      | { step = (`Fork _ | `Qed _) } -> tip
+      | { step = `Sideff (`Ast(_,id)) } -> id
+      | { step = `Sideff _ } -> tip
       | { next } -> master_for_br root next in
   let reopen_branch start at_id mode qed_id tip old_branch =
     let master_id, cancel_switch, keep =
-- 
cgit v1.2.3