using your screenshot, just marking something:
[image: 2023-07-31 08_46_47-Merge.png]
--
You received this message because you are subscribed to the Google Groups
"TortoiseSVN" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to
Hi,
I attached 3 screenshots of the merging and the following error.
Our svn repository setup looks like that
repository
trunk/
branches/patchBranch1_x
Repro:
1. Checkout both (trunk and the patch branch)
1. D:\code\trunk
2. D:\code\patchBranch1_x
2. Commit a
måndag 31 juli 2023 kl. 08:55:23 UTC+2 skrev Manuel Leithner:
[...]
[image: 2023-07-31 08_46_53-Merge Failed!.png]
Can't reproduce it unfortunately. When I click OK in the above dialog, I
get the task dialog Command failed - Update needed with the choices to
update or cancel.
(I'm now
yes you are right. I don't want to perform a mixed version merge (that
works - tested it multiple times).
But i don't get the Command failed dialog. Only option is to click on OK
and then I will loose the whole merge info (selected revisions)
[image: 2023-07-31 11_25_40-TortoiseSVN.png]
do you perform a specific merge (manually choosing the revisions) ? in your
screenshot above it shows '"Auto-merge"
Daniel Sahlberg schrieb am Montag, 31. Juli 2023 um 12:55:32 UTC+2:
> måndag 31 juli 2023 kl. 11:28:47 UTC+2 skrev Manuel Leithner:
>
> yes you are right. I don't want to perform
måndag 31 juli 2023 kl. 11:28:47 UTC+2 skrev Manuel Leithner:
yes you are right. I don't want to perform a mixed version merge (that
works - tested it multiple times).
But i don't get the Command failed dialog. Only option is to click on OK
and then I will loose the whole merge info (selected
lördag 29 juli 2023 kl. 07:27:47 UTC+2 skrev Stefan:
On Friday, July 28, 2023 at 10:43:06 PM UTC+2 daniel.l...@gmail.com wrote:
If there's anything I missed, just shout.
Looks good I think.
How about updating https://openhub.net/p/tortoisesvn?
updated the url yesterday, but the status is
