On 23.02.2017 10:10, Gerhard Pobinger wrote:
> Hy *,
> using TortoiseSVN 1.9.5, Build 27581 - 64 Bit , 2016/11/26 09:18:58.
> By accident/silliness/inability when merging back (reintegrating) a branch B, some items in the target branch T got replaced by the ones from the B. For instance, a directory 'X' with history (say t_1,..., t_10) that was replaced by a directory of the same name 'X' but now it completely took over the history from the other branch (b_1,...,b_10). No clue as to why, but shit happens, so we checked out a working copy from one revision before the deadly merge-commit.
> Expectation was that there, the original logs (t_1,..., t_10) would show up for item 'X' in Tortoise->Show Logs, but they dn't. Instead the logs from the branch are still shown (b_1,...,b_10) in the tortoise log windows.
> BUT whe we do a "svn log X" from the command line we see the expected logs (t_1,..., t_10).
> Just to make sure: "enable log caching", "allow ambigous URLS", "allow ambigous UUIDs" are all turned off.
> Is this a problem with TortoiseSVN or what can I do here?
the command line client uses the wc revision to show the log from. TSVN
however always uses the HEAD revision.
If you want to show the log in such situations, you can use the repo
browser, switch to the revision and then show the log from there.
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-02-25 09:01:42 CET