On 2013-04-06 21:42, Stefan Küng wrote:
> 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 meant ask What file (view) to "save as".
>
>> 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"?
here is code "snip":
bool CMainFrame::FileSaveAs(bool bCheckResolved /*=true*/)
{
if (bCheckResolved && HasConflictsWontKeep())
return false;
CString fileName;
if(!TryGetFileName(fileName))
return false;
SaveFile(fileName);
return true;
}
first if is making sure user know there are unresolved changes ...
SaveFile call allows to mark resolved
Note: I did not try that - just reading code
>
>> 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.
So :
1. is mark as resolved shown in this case ?
2. is target file (with new name) marked as resolved - what ever state
it had before. (e.g. TortoiseProc is called for it?)
3. you start to add GIT I guess there are also conflicts, will T-Merge
support that?
>
>> 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.
Only for "save as" dialog; I'll try my best ... adding default option
continue resolving would do that?
>
> Stefan
>
Oto
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3052696
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-04-06 22:08:38 CEST