1390             # Since we are only looking at branching at update, we need to

  1390             # Since we are only looking at branching at update, we need to

  1391             # detect this situation and perform this action lazily.

  1391             # detect this situation and perform this action lazily.

  1392             if tracking[remote] != self._gitcurrentbranch():

  1392             if tracking[remote] != self._gitcurrentbranch():

  1393                 checkout([tracking[remote]])

  1393                 checkout([tracking[remote]])

  1394             self._gitcommand(['merge', '--ff', remote])

  1394             self._gitcommand(['merge', '--ff', remote])

  1395         else:

  1396         else:

  1396             # a real merge would be required, just checkout the revision

  1397             # a real merge would be required, just checkout the revision

  1397             rawcheckout()

  1398             rawcheckout()

  1398 

  1399 

  1399     @annotatesubrepoerror

  1400     @annotatesubrepoerror