[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] get_merge_info_for_path brings no result while eliding

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-10-11 03:14:37 CEST

On Tue, 10 Oct 2006, Kamesh Jayachandran wrote:
...
> get_merge_info_path fails in the cases if the path is '/a/b/c/d/e'
> and the repo has the mergeinfo only for '/a/b/c' and no mergeinfo
> for '/a/b/c/d'.
>
> * subversion/libsvn_fs_util/merge-info-sqlite-index.c
> (global): remove NEGATIVE_CACHE_RESULT.
> (get_merge_info_for_path):
> Irrespective of 'setresult' translate the hash keys of 'elided parent->path'
> and set it to cache, so that we don't loose the 'mergeinfo' of '/a/b/c'
> during unwinding phase of recursion with path '/a/b/c/d'.
...

This is the expected behavior. If you change (or remove) the merge
info on '/a/b/c/d', you're implicitly changing the merge info for all
children of 'd'. If you want to change the merge info for *only* 'd',
you must update the merge info for its children (e.g. '/a/b/c/d/e') to
retain any previous value.

  • application/pgp-signature attachment: stored
Received on Wed Oct 11 03:13:12 2006

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