collaborating despite different configurations (tracked)

[Roger Gammans]

On Wed, Oct 26, 2011 at 10:12:02AM +0200, Arne Babenhauserheide wrote:
> Hi, 
> 
> We need to share code between different machines and the code contains machine-dependent data (compile flags, since it does on-demand compilation). The code is not ours, so we can???t just factor out all machine-dependent code. 
> 
> Do you know a way to share the changes cleanly? Bonus points for
> 
> * not needing extensions (I have to explain the setup to my co-workers, and I want it to be easy).
> * being able to hack on the production tree.


When I get in that sitituation I normally create a version of the 
machine files with a different extension.

The when I clone a repo I need to a :-
 for file *.production; do cp $file ${file%%.production}; done

followed by what ever localfile  edits are appropriate, it
as the disadvantage you need to remember to edit the production files
if you add a new setting (or whatever to them).

But that assumes your data is neatly split at least on a per-file
basis between machine dependent code and non-dependent code.

For django projects, I've been splitting the settings file into
two handle this case more cleanly . Butit sounds like you might
not have that luxury

I'd be interesting on hearing if there is a better way .

TTFN
-- 
Roger. 	                        Home| http://www.sandman.uklinux.net/
Master of Peng Shui.      (Ancient oriental art of Penguin Arranging)
Work|Independent Sys Consultant | http://www.computer-surgery.co.uk/
 New key Fpr: 0F2F E1DF 4CD2 5E7B EF9F  B173 4CFA F143 ADBE 6B00 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20111026/356a4e80/attachment.asc>