mercurial/merge.py
changeset 34486 a57c938e7ac8
parent 34479 99c3dee3f6ce
child 34522 bed1d2eaa108
equal deleted inserted replaced
34485:37b7581e5737 34486:a57c938e7ac8
   417             self._repo.vfs.write('merge/' + hash, fcl.data())
   417             self._repo.vfs.write('merge/' + hash, fcl.data())
   418         self._state[fd] = ['u', hash, fcl.path(),
   418         self._state[fd] = ['u', hash, fcl.path(),
   419                            fca.path(), hex(fca.filenode()),
   419                            fca.path(), hex(fca.filenode()),
   420                            fco.path(), hex(fco.filenode()),
   420                            fco.path(), hex(fco.filenode()),
   421                            fcl.flags()]
   421                            fcl.flags()]
   422         self._stateextras[fd] = { 'ancestorlinknode' : hex(fca.node()) }
   422         self._stateextras[fd] = {'ancestorlinknode': hex(fca.node())}
   423         self._dirty = True
   423         self._dirty = True
   424 
   424 
   425     def __contains__(self, dfile):
   425     def __contains__(self, dfile):
   426         return dfile in self._state
   426         return dfile in self._state
   427 
   427 
   862             else:
   862             else:
   863                 a = ma[f]
   863                 a = ma[f]
   864                 fla = ma.flags(f)
   864                 fla = ma.flags(f)
   865                 nol = 'l' not in fl1 + fl2 + fla
   865                 nol = 'l' not in fl1 + fl2 + fla
   866                 if n2 == a and fl2 == fla:
   866                 if n2 == a and fl2 == fla:
   867                     actions[f] = ('k' , (), "remote unchanged")
   867                     actions[f] = ('k', (), "remote unchanged")
   868                 elif n1 == a and fl1 == fla: # local unchanged - use remote
   868                 elif n1 == a and fl1 == fla: # local unchanged - use remote
   869                     if n1 == n2: # optimization: keep local content
   869                     if n1 == n2: # optimization: keep local content
   870                         actions[f] = ('e', (fl2,), "update permissions")
   870                         actions[f] = ('e', (fl2,), "update permissions")
   871                     else:
   871                     else:
   872                         actions[f] = ('g', (fl2, False), "remote is newer")
   872                         actions[f] = ('g', (fl2, False), "remote is newer")