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

Re: [PATCH] Warn when attempting to reverse merge range from target's future history

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Wed, 20 Feb 2008 14:20:55 +0530

> err = svn_client__repos_locations(&start_url, &start_revision,
> NULL, NULL, ra_session, url1,
> &pegrev, &requested,
> &unspec, ctx, pool);
> ...
> }
>
> In the above example we now have a case where url1_at_entry->revision is
> different from entry->url, specifically:
>
> url1: file:///C:/SVN/src-branch/Release/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-87/UNRELATED_A
>
> entry->revision: 2
>
> url1_at_entry->revision:
> file:///C:/SVN/src-branch/Release/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-87/UNRELATED_A
>
> entry->url: file:///C:/SVN/src-branch/Release/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-87/A
>
> We don't want to give the warning "Cannot reverse merge a range from a
> path's own future history; try updating first" because the range is
> not from the merge target's future (or past) history and updating
> still won't help here. FWIW, all that will help is using
> --ignore-ancestry.
>
> Does that answer your question?
>
>

Thanks for the detailed explanation Paul.

Now I am fine with 'svn_client__repos_locations' call.

With regards
Kamesh Jayachandran

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-20 10:40:16 CET

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