Comment 13 for bug 395731
Revision history for this message
| Marius Kruger (amanica) wrote Re: [Bug 395731] Re: Need a way to set content-filtering rules across the project | #13 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
bbfa235
(Get the code!)
On 10 November 2010 16:20, Frits Jalvingh <email address hidden> wrote:
> Marius, I wonder how you would maintain that file during merges et al? If branch a is merged into branch b, how is this file maintained? Has there been talk about workspace file handling that occur due to changes to this file?
I was wondering about that too. If its in the workingtree then it
would get merged like any other text file. With tags I think we just
overwrite the target values.
I suppose we should be able to use our normal merging algorithms if it
is in .bzr/branch/rules too, but then we need to tell the user about
conflicts in it etc.
Its becoming a second versioned dir. This is sort of what people have
been asking for versioned properties. We can have a nested tree inside
eg. .bzr/branch/
want (.bzr ignore rules conf andotherstuff)... its so crazy it just
might work (just need to make sure we dont recurse)