equal
deleted
inserted
replaced
369 other_tt = other[0] |
369 other_tt = other[0] |
370 if value[1] == other[1]: |
370 if value[1] == other[1]: |
371 continue |
371 continue |
372 # content from "major" wins, unless it is older |
372 # content from "major" wins, unless it is older |
373 # than the branch point or there is a merge |
373 # than the branch point or there is a merge |
374 if ( |
374 if new_tt == other_tt: |
375 new_tt == other_tt |
375 minor[dest] = value |
376 or not isancestor(new_tt, other_tt) |
376 elif value[1] is None and dest in changes.salvaged: |
377 or dest in changes.merged |
377 pass |
378 ): |
378 elif other[1] is None and dest in changes.salvaged: |
|
379 minor[dest] = value |
|
380 elif not isancestor(new_tt, other_tt): |
|
381 minor[dest] = value |
|
382 elif dest in changes.merged: |
379 minor[dest] = value |
383 minor[dest] = value |
380 |
384 |
381 |
385 |
382 def _revinfo_getter_extra(repo): |
386 def _revinfo_getter_extra(repo): |
383 """return a function that return multiple data given a <rev>"i |
387 """return a function that return multiple data given a <rev>"i |