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

Re: [PATCH] allow conflict descriptions with NULL repos_relpaths

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 13 Aug 2014 13:04:17 +0200

On Tue, Aug 12, 2014 at 08:04:37PM +0000, Bert Huijben wrote:
> I don't see a problem with not allowing a repository location, but it doesn't
> make sense to me to have a revision in that case. You either have both, or
> have none.
> If you want to tell that the node didn't exist in a revision it makes more

No, that's not what I want to tell.

> sense to me to tell that it did’t exist at a specific path in that revision…
> which should already be possible, with the original checks.

I already know the path is missing. What I don't know is which revision
the conflicted node was updated to when the conflict was recorded.
We don't write this revision down when the node is missing.

I need to know the update's target revision for a conflict resolution
tool I'm writing. And at some point (I hope) 'svn' will want to know
the revision as well.

Alternatively, we could record this revision seperately somewhere.
But then we would store it redundantly whenever the victim is present
in the target revision.
Received on 2014-08-13 13:04:50 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.