Am Donnerstag, 20. September 2012 um 09:58:05, schrieb Kornel Benko 
<[email protected]>
> Am Dienstag, 18. September 2012 um 21:37:53, schrieb Kornel Benko 
> <[email protected]>
> > Maybe not important, but the format string may lead to crash, so I would 
> > prefer explicit cast here...
> > ...
> > /usr/src/hugin/hugin_hg/src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp:
> >  In member function ‘int HuginBase::CalculateOptimalROI::autocrop()’:
> > /usr/src/hugin/hugin_hg/src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp:402:109:
> >  warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has 
> > type ‘long int’ [-Wformat]
> > /usr/src/hugin/hugin_hg/src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp:416:109:
> >  warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has 
> > type ‘long int’ [-Wformat]
> > ...
> >     Kornel
> 
> Since nobody answered, I committed the change in the default branch. To my 
> surprise Thomas Modes
> also already committed to branch gui_overhaul.
> 
> Now, there is a problem. After updating to branch gui_overhaul, the changes 
> (from Thomas _and_ me) are lost.
> Sure I don't understand how hg acts here. (I suspect the use of "hg push -f" 
> causes this.)
> 
> So, sorry to causing troubles. Could someone point me to a reasonable 
> handling as how to
> correctly resolve such conflicts?
> 
>       Kornel

Forget it. I have incidentally overwritten Thomas's changes.

        Kornel

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to