Re: [PATCH] allow conflict descriptions with NULL repos_relpaths

2014-08-13 Thread Stefan Sperling
On Tue, Aug 12, 2014 at 08:04:37PM +, 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

Re: [PATCH] allow conflict descriptions with NULL repos_relpaths

2014-08-12 Thread Bert Huijben
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 sense to me to tell that it did’t exist at a specific

[PATCH] allow conflict descriptions with NULL repos_relpaths

2014-08-12 Thread Stefan Sperling
I'd like to always make update/switch target revisions available to the conflict resolver. We currently don't record this information for tree conflict victims which are not present in the target revision. For instance, 'svn info' might show: Tree conflict: local file edit, incoming file delete or