0.13: Bzr is frozen. Can't escape from a conflicted state.

[Nicholas Allen]

Could this situation be avoided by not allowing a merge or pull while 
there are unresolved conflicts?

Nick

Jari Aalto wrote:
> John Arbash Meinel <john at arbash-meinel.com> writes:
>
>   
>>>   conflicts:
>>>     Conflict adding file debian/rules.BASE.  Moved existing file to debian/rules.BASE.moved.
>>>     Conflict adding file debian/rules.OTHER.  Moved existing file to debian/rules.OTHER.moved.
>>>     Conflict adding file debian/rules.THIS.  Moved existing file to debian/rules.THIS.moved.
>>>       
>> It doesn't say that 'rules' is conflicted. It says that 'rules.BASE',
>> 'rules.OTHER' and 'rules.THIS' are conflicted.
>>
>> My best guess is at some point you added them and then committed,
>> without realizing they were conflict files. And now they actually
>> conflicted during a merge, but you deleted them all as part of a
>> resolution phase. (It may be that 'bzr resolve rules' deleted them for you).
>>
>> You should be able to:
>>
>> bzr resolve rules.BASE
>> bzr resolve rules.OTHER
>> bzr resolve rules.THIS
>>     
>
> Thanks, that did fixed it.
>
>   
>> And then be able to commit.
>>
>> Though you may also want to do:
>>   bzr remove rules.BASE rules.OTHER rules.THIS
>>     
>
> These were not versioned, so the above was all that was needed.
>
> SUGGESTION
>
> - Would it be possible to drop the "." from the end of filenames? Now
>   copy/paste with mouse takes that "." with it and not just the plain
>   filename. Like:
>
>   Conflict adding file debian/rules.BASE - Moved existing file to debian/rules.BASE.moved
>
> Jari
>
>
>