Greg Hudson wrote:
>On Tue, 2001-12-11 at 14:43, Karl Fogel wrote:
>
>>I reread Ben's document, and your paragraph, and I'm still not
>>understanding the problem. Sorry, could you be more verbose?
>>
>
>During a commit operation for a file, there are three potentially
>different states of the file contents to consider:
>
> 1. The bits of the file on disk, before the commit command is run
> 2. The bits which are committed to the repository
> 3. The bits of the file on disk, after the commit command is run
>
>I assert that (1) and (2) should always be the same, to avoid
>irrevocably destroying data, even though that means the repository has
>to store some gratuitous diffs a lot of the time. However, (3) should
>be different; we should do a keyword substitution on the file after we
>commit it, since certain keyword tags will become different as a result
>of the commit. (No compelling reason to do a newline substitution,
>though.)
>
But that's inconsistent. Following this recipe would get keyword
expansions committed into the repository, thereby making diffs and
merges of files with expanded keywords the kind of PITA they are in CVS
today.
--
Brane �ibej <brane_at_xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:52 2006