diff options
| author | Maxime Dénès | 2017-06-05 22:46:34 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2017-06-05 22:46:34 +0200 |
| commit | c9c9be2c3eb451ac5bcc1bc08f98b3176f29c84d (patch) | |
| tree | 96fe450bb5f9775e79c6fe5a3a5b054b7fc568f5 | |
| parent | 5a5d37b83c487903963aa39799a1367752857da4 (diff) | |
| parent | c86d8e5314d1a1a8ef3776ef0ba25b3f592f48da (diff) | |
Merge PR#726: [stm] Solve bug 5577 "STM branch name is incorrect with Time"
| -rw-r--r-- | stm/stm.ml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/stm/stm.ml b/stm/stm.ml index 2057496f4b..07219f2547 100644 --- a/stm/stm.ml +++ b/stm/stm.ml @@ -474,10 +474,12 @@ end = struct (* {{{ *) vcs := rewrite_merge !vcs id ~ours ~theirs:Noop ~at branch let reachable id = reachable !vcs id let mk_branch_name { expr = x } = Branch.make - (match x with + (let rec aux x = match x with | VernacDefinition (_,((_,i),_),_) -> Names.string_of_id i | VernacStartTheoremProof (_,[Some ((_,i),_),_],_) -> Names.string_of_id i - | _ -> "branch") + | VernacTime (_, e) + | VernacTimeout (_, e) -> aux e + | _ -> "branch" in aux x) let edit_branch = Branch.make "edit" let branch ?root ?pos name kind = vcs := branch !vcs ?root ?pos name kind let get_info id = |