Hello, Stefan!
>> I'm using TortoiseSVN 1.3.2, Build 5840 - 32 Bit on WinXP.
>>
>> Here is the scenario:
>>
>> 1) create a file under a folder: /trunk/a.txt
>> 2) create two branches (copies of the trunk): /branch and /branch-base
>> 3) modify /branch/a.txt (say, add a single character 'a' in it), and
>> commit it.
>> 4) modify /branch-base/a.txt in the same way as /branch/a.txt, so there
>> is no difference between /branch/a.txt and /branch-base/a.txt, commit it.
>> 5) Now, switch working copy to /trunk and perform merge, comparing
>> /branch-base with /branch.
>> Pushing the button "Unified diff", you will get the message "No
>> differences found". Though if you push buttons "Dry run" or "Merge", you
>> will see that the file a.txt is got updated, which is not true.
>>
>> When doing the same merge with command line client (1.2.1), no updates
>> are shown.
> * please try the 1.3.0 command line client
> * check our docs about the command line equivalents, maybe you forgot
> a switch to pass for the merge which would make the command line
> client print out the info as well.
Just tried 1.3.0.
It does not show any updates either. Moreover, I couldn't find any way to make it show the updates. Still I find it logical, since both branches are absolutely same.
The docs say:
----------
D.2.20. Merge
svn merge [--dry-run] From_URL@revN To_URL@revM PATH
The Dry run performs the same merge with the --dry-run switch.
svn diff From_URL@revN To_URL@revM
The Unified diff shows the diff operation which will be used to do the merge.
----------
And that's exactly how I tried to perform merge with command line client.
Sincerely yours,
Ivan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Mar 10 15:10:06 2006