[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Bug Report: Tortise Merge - Use this whole file

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-03-16 21:07:34 CET

Mike Grandmaison wrote:
> Thanks for looking into it.
>
> The file is listed in the text status as modified, does it list as
> conflicted if it is conflicted?
>
> I tried it again with the same effect. There are no extra files in the
> directory so I don't think this fits the conflict scenario. Also I
> looked at the actual file after using the "use this whole file" option
> and the file did change but not to what it showed it should change to in
> the working copy.
>
> Am I missing something?
>
> Here is another perhaps easier use case,
> load up the file that was modified,
> in the working base select a change and say "use this whole file",
> you notice the change moving over to the working copy,
> now save - the working copy no longer shows a star as having modifications,
> now use the file - reload,
> the working copy comes back as it was at the start of the operation.
>
> If I take a look at the actual file it remains unchanged.
>
> I have an account on the issue tracker but I didn't see any upload
> buttons - my account it probably just as limited as guest I suppose or
> perhaps more. I zipped the .mov into 640k if you want to have a look
> but as you said the description should be enough.

Autsch!
I could reproduce it with some other test files. It only happens if
there are added/deleted blocks and not just 'modified' lines shown.

Thanks for being insistent here :)

Fixed in revision 8975.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Mar 16 21:07:46 2007

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.