Log Dialog: "Merge revisions to..." action does not record merge info anymore

18 views
Skip to first unread message

Martin Brieg

unread,
Oct 17, 2023, 5:27:49 AM10/17/23
to TortoiseSVN
When merging revisions from the Log Dialog via the context menu entry "Merge revisions to...", no merge info will be recorded anymore. The progress dialog that pops up after starting the merge always says in the command "ignoring ancestry".

Before Tortoise 1.14.4, the merge info was recorded.

The change seems to come from Rev. 29401, which adds the following options to progress dialog when executing the context menu action "merge revisions to...":
dlg.SetOptions(ProgOptIgnoreAncestry | ProgOptAllowMixedRev);

According to the commit message, only the second option was intended.

Martin Brieg

unread,
Oct 17, 2023, 5:39:45 AM10/17/23
to TortoiseSVN
Nevermind, now found that it was already reported at https://groups.google.com/g/tortoisesvn/c/f76PCXaRlV8/m/Fv1MK82xCAAJ.
Reply all
Reply to author
Forward
0 new messages