[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: Fri, 15 Feb 2008 19:35:29 +0530

> svn: warning: Cannot reverse merge a range from a path's own future
> history; try updating first
>
>
>
> Beyond the obvious question of "is the right course of action", I was wondering:
>
> 1) Does that error message make sense?
>

Looks fine with me.

I have couple of comments to your patch.

Sorry for not able to respond inline to your original patch(blame my
mailer).

Comment1:
The outer condition to show the warning message should be

- if (((*remaining_ranges)->nelts == 0)
- && (revision2 < revision1)
- && (entry->revision < revision2))

+ if (((*remaining_ranges)->nelts == 0)
+ && (revision2 < revision1)
+ && (entry->revision <= revision2))

i.e The final condition should be 'entry->revision <= revision2' not
entry->revision < revision2

Comment2:

Why should we use 'svn_client__repos_locations' to get the URL of
ulr1_at_revision1 at entry->revision? Is it needed?

Thanks
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-15 15:06:11 CET

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