[MERGE] line-endings support: part 1 of 2: versioned properties

[Nicholas Allen]

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

|
|
| E.g. if you have many C-files then you need to set only one property 
section
|
| bzr prop-set *.c foo bar
Shouldn't that be "bzr prop-set foo bar *.c"?

|
|> Personally, I think it would be better to have a separate file for 
"automatic properties" that are set when adding files (by matching them 
with a file name pattern) but which do not apply to files that have 
already been added and are under version control.
|
| I think we don't need such "automatic properties" at all.
| It's not svn properties, it's bzr properties.
Ok - I am used to using Subversion so maybe I'm locked into this way of 
thinking. Your approach could be better but I have not used it in 
practice so it is hard for me to say. I'm worried if adding a wildcard 
section could affect some files you did not intend to change but maybe 
this would not be a problem.
|
|> Also I think the problem with conflicts in this file would be a bit 
annoying. New properties will be added at the end I guess and so if 2 
branches set properties (even on different files or different 
properties) this will cause a conflict. I realize this is a limitation 
of your simple approach but I wonder if this would be too annoying to 
use in practice. Especially, as bazaar has the automatic gatekeeper as a 
workflow - I think this would cause unnecessary conflicts that would 
make this workflow not useable anymore because the gatekeeper could not 
automatically resolve all these conflicts.
|
| I expect that file with properties will not be changing too often, as 
I explain
| above new copy of properties will not be auto-added for every new file.
Good point. As long as people don't use it in the svn way of setting the 
properties on each individual file instead of using wildcards. I guess a 
special merge algorithm could be written for this file that handles 
these cases without conflicts though - couldn't it?

Cheers,

Nick
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
 
iD8DBQFIAzLZbpmWsXfOU58RAoN+AKDD85FT8HwKkSe64w1D7HHkSDDukwCeOw6r
Jj3gp9gZrA9Ln1lWDlnfgNg=
=yXyC
-----END PGP SIGNATURE-----