Re: T-Merge Save as behaviour

On 06.04.2013 21:10, Oto BREZINA wrote:
> I'm continuing in "Multi-view edit".
>
> I plan to add question what file to "save as" even only one file is
> editable.

you mean you want to ask where to save the file all the time?
Please don't do that.

> I found out that using "save as" file can get resolved. Is this really
> good idea? Whag file is resoulved (one with old name or with new name?)

What do you mean by "resolved"?

> From my point of view when you "save as" original conflicted file is
> not resolved. Did I miss something?

No, when you save the file to a different name/location, the original
file is not marked as resolved because it isn't resolved - the saved
file will be but not the file that has the conflicts.

> Instead of ask user to resolve any remaining blocks, I plan to simply
> note it in displayed options dialog.

Nope, don't do that. It's important that files get resolved.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3052695
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].