[PREVIEW] line-endings support

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ian Clatworthy wrote:
| John Arbash Meinel wrote:
|
|> So... my opinions on the good and bad of something like this.
|
|> If I change the '.bzrprop' file, and then do a:
|>
|> bzr commit -m "just foo" foo
|>
|> How should 'foo' be handled. I think it should technically use the
|> '.bzrprop'
|> that has already been committed, ignoring the one in the working tree. Why?
|> Because when you check it out, that is the one that is going to be read.
|
| Good point.
|
|> Having the file somewhere else makes it clear that you just use that file.
|>
|> Having versioned properties associates the data with the file you are
|> committing. So it isn't possible to commit the data without the
|> meta-data. (Now,
|> you can get creative with a .bzrprop file and commit the portions of the
|> file
|> that relate to what you are changing, but that gets *really* tricky.)
|>
|> Note that I think the way to solve this is to introduce a
|> SelectedFilesWorkingTree object, which can grab the contents of files
|> based on
|> whether they were
|
| Can you complete your thoughts here?

Sorry, just that it would be a mask. So selected files would be retrieved from
disk. Unselected files would be retrieved from the basis tree.

In general, we don't use access files that aren't selected during commit, so it
doesn't matter. But if we start something like .bzrprop, then we might.

| Yes, very helpful thank-you.


John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkgF87kACgkQJdeBCYSNAAOL1gCfQ7DLCL2pvH1SY9gZtPdR51qj
oVMAn0rDHSBu9Zvmy5irZ7jgMJUH9S1R
=v65d
-----END PGP SIGNATURE-----