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

conflict-storage, and filenames

From: Greg Stein <gstein_at_gmail.com>
Date: Sat, 8 May 2010 23:15:31 -0400

Hey all,

In wc-1, we record filenames where merge sources are stored, and where
property rejects are written. These are:

entry->conflict_wrk, ->conflict_old, ->conflict_new, and ->prejfile

These file names do not appear to have any corresponding values in the
proposed skels detailed in notes/wc-ng/conflict-storage.

We cannot simply derive the filenames because there may be versioned
(or unversioned) content with the same names. We don't apply/make
rules on file naming, so the code works on finding unique names along
certain understandable patterns. But I believe we need to record
*what* name was chosen.

I'm unsure of how to model this. Any ideas?

Received on 2010-05-09 05:16:10 CEST

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