It (sometimes) saves the edited file, but nothing ever reads it afterwards.
There's no way, for example, to install a partially edited conflicted file
into the WC, then postpone the remaining resolution for later. :(
On 21 Oct 2013 16:17, "Philip Martin" wrote:
> Philip Martin writes:
>
> > Bran
Philip Martin writes:
> Branko Čibej writes:
>
>> On 18.10.2013 23:13, Branko Čibej wrote:
>>> Can someone explain what the purpose of the save_merged flag in the
>>> conflict result struct is? It's used once in our code, but as far as I
>>> can see, the resulting .edited file isn't actually by
Branko Čibej writes:
> On 18.10.2013 23:13, Branko Čibej wrote:
>> Can someone explain what the purpose of the save_merged flag in the
>> conflict result struct is? It's used once in our code, but as far as I
>> can see, the resulting .edited file isn't actually by the code anywhere.
>
> "Isn't a
Branko Čibej wrote:
> Can someone explain what the purpose of the save_merged flag
> in the conflict result struct is? It's used once in our code,
> but as far as I can see, the resulting .edited file isn't
> actually [used] by the code anywhere.
This area of conflict handling is buggy and incompl
On 18.10.2013 23:13, Branko Čibej wrote:
> Can someone explain what the purpose of the save_merged flag in the
> conflict result struct is? It's used once in our code, but as far as I
> can see, the resulting .edited file isn't actually by the code anywhere.
"Isn't actually *used by* the code anyw
Can someone explain what the purpose of the save_merged flag in the
conflict result struct is? It's used once in our code, but as far as I
can see, the resulting .edited file isn't actually by the code anywhere.
-- Brane
--
Branko Čibej | Director of Subversion
WANdisco // Non-Stop Data
e. br...
6 matches
Mail list logo
