[PATCH][merge-tracking]Testcase to exhibit the defect in mergeinfo retrieval from the grand parent

[Kamesh Jayachandran <ka...@collab.net>]

Hi All,
Find the attached patch and log.

The patch I had attached to the list with the subject 
'[PATCH][merge-tracking]get_merge_info_for_path eliding fails when 
ancestor has mergeinfo or null mergeinfo.(Take2)' on 19-10-2006 should 
fix this.

Till it gets committed I want this testcase to have XFail.


With regards
Kamesh Jayachandran

Re: [PATCH][merge-tracking]Testcase to exhibit the defect in mergeinfo retrieval from the grand parent

[Daniel Rall <dl...@collab.net>]

On Tue, 31 Oct 2006, Daniel Rall wrote:

> On Fri, 27 Oct 2006, Kamesh Jayachandran wrote:
> ...
> > Test case to showcase the failure of mergeinfo retrieval on a path 
> > which has elided mergeinfo and its immedeate parent path too having a elided 
> > mergeinfo while grandparent of path having the direct mergeinfo.
> > 
> > * subversion/tests/cmdline/merge_tests.py
> >   (mergeinfo_retrieval_from_grand_parent): 
> >    New function.
> >   (tests_list):
> >    included the above test as XFail.

Committed in r22184 with some tweaks, along with the fix for the
"repeated merge must use inherited merge info" problem being tested
for.

Re: [PATCH][merge-tracking]Testcase to exhibit the defect in mergeinfo retrieval from the grand parent

[Daniel Rall <dl...@collab.net>]

On Fri, 27 Oct 2006, Kamesh Jayachandran wrote:
...
> Test case to showcase the failure of mergeinfo retrieval on a path 
> which has elided mergeinfo and its immedeate parent path too having a elided 
> mergeinfo while grandparent of path having the direct mergeinfo.
> 
> * subversion/tests/cmdline/merge_tests.py
>   (mergeinfo_retrieval_from_grand_parent): 
>    New function.
>   (tests_list):
>    included the above test as XFail.