def test_mergeinfo_merge(self): """Test svn_mergeinfo_merge()""" mergeinfo1 = core.svn_mergeinfo_parse(self.TEXT_MERGEINFO1) mergeinfo2 = core.svn_mergeinfo_parse(self.TEXT_MERGEINFO2) mergeinfo3 = core.svn_mergeinfo_merge(mergeinfo1, mergeinfo2) self.inspect_mergeinfo_dict(mergeinfo3, self.MERGEINFO_SRC, self.MERGEINFO_NBR_REV_RANGES)
def mergeinfo_merge(mergeinfo1, mergeinfo2): """Like svn.core.svn_mergeinfo_merge(), but preserves None-ness.""" if mergeinfo1 is None and mergeinfo2 is None: return None if mergeinfo1 is None: return mergeinfo2 if mergeinfo2 is None: return mergeinfo1 return core.svn_mergeinfo_merge(mergeinfo1, mergeinfo2)