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

RE: Working Copy (NG) Data Model

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 16 Dec 2008 14:10:32 +0000

Bert Huijben wrote:
> For richer conflict handling I would like to add:
>
> * Older
> - repos URL_at_REV
> - cached text and props (if caching enabled)
>
> * Theirs
> - repos URL_at_REV
> - cached text and props (if caching enabled)
>
> * Mine
> - (no repos representation)
> - cached text and props (always)

Yes, I agree, for reasons like those you gave. Note that we already
store

   * Older
     - repos URL_at_REV

   * Theirs
     - repos URL_at_REV

- Julian

> s/Theirs/Left/ and s/Mine/Right/ where appropriate.
>
> This would finally allow a non interactive handling of conflicts that is at
> least as powerful as the current interactive (only) handling.
>
> This representation allows checking which properties are conflicted instead
> of that one or more properties are conflicted and GUIs can use the repos
> URL_at_REV information to provide log messages and other information that is
> currently not accessible for text and property conflicts.
>
>
> For the cli it would allow making 'svn resolve' (without arguments)
> interactive as it would have access to exactly the same information as our
> interactive conflict handler has now.
> (I think this was one of the plans around the release of subversion 1.5)
>
> Bert

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=984992
Received on 2008-12-16 15:11:09 CET

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