svn path=/main/trunk/; revision=6615
if newconf == mrgconf and \
self.options.get('ignore-previously-merged') != 'yes' and \
- len(commands.getoutput(DIFF_CONTENTS % (conf['current'], mrgconf))) == 0:
+ os.path.exists(archive+'.dist') and \
+ len(commands.getoutput(DIFF_CONTENTS % (archive+'.dist', conf['new']))) == 0:
# The current update is identical to the archived .dist
# version that has previously been merged.
os.unlink(mrgconf)