On 28 Aug 2014, at 17:03, Dan Ellis wrote: > > > We maintain some vendor-like code on some branches that we periodically > want to merge into our development branch. The problem is that both in > our development branch and in the vendor-like branch, we use subversion > properties for some house keeping tasks (test status, etc.). When we want > to merge we cannot stop from pulling over these properties and end up > clobbering our house keeping properties and creating property merge > conflicts. [...]
How about using different names for the properties in your development branch vs the vendor-like branch? That way you wouldn't get a conflict when merging, and the properties from the vendor-like branch would never overwrite the properties in the production branch. Those properties would clutter-up the production branch, but would not cause any problem and could be removed at your leisure in some later commit. -- Garance Alistair Drosehn = dro...@rpi.edu Senior Systems Programmer or g...@freebsd.org Rensselaer Polytechnic Institute; Troy, NY; USA
