[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH][merge-tracking]data confusion(corruption?) when the source of merge has the merges from multiple other sources

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-11-14 21:50:56 CET

Nice work, Kamesh. I commit ed your changes to the branch in r22303
with the following change log message:

--- snip ---
On the merge-tracking branch: Correct memory management while
iterating over records returned by sqlite (which re-uses its memory
across cursor locations). Also, actually return the correct the merge
info in every case. These problems show up if you have source of copy
having merge from two or more different merge sources.

* subversion/libsvn_fs_util/merge-info-sqlite-index.c
  (parse_mergeinfo_from_db): Copy the "mergedfrom" value procured from
   sqlite into our own pool. Set "lastmergedfrom" as the key for our
   *RESULT hash to get the correct set of revision ranges for each
   merge source.

Patch by: Kamesh Jayachandran <kamesh@collab.net>
--- snip ---

I was wondering if that block in parse_mergeinfo_from_db() could be
simplified -- or at least made more clear -- using a do/while loop
construct. What do you think?

- Dan

  • application/pgp-signature attachment: stored
Received on Tue Nov 14 22:03:21 2006

This is an archived mail posted to the Subversion Dev mailing list.