Re: merge shows redundant updates

On 3/10/06, Gerasimov, Ivan <Ivan.Gerasimov@transas.com> wrote:

> 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.
>
> If you switch from /trunk/a.txt to either /branch/a.txt or /branch-base/a.txt, Tortoise will show you that the file a.txt is updated. That's fine. If you switch from /branch/a.txt to /branch-base/a.txt, Tortoise will not show any updates. That's also fine.
>
> 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.

Stefan

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org