On Tue, Apr 24, 2012 at 06:06:52PM +0200, Thorsten Schöning wrote: > I don't think so, I need the tag to be as it is now, because that's > what get's deployed to the production servers and it really consists > all a web application for a customer needs and I want it versioned in > one combined folder. Because former versions of the svn client seemed > to ignore my file replacement to a symlink we were able to implement > this fast bugfix process: Test the customer templates and most of the > configuration with the symlinked programs from trunk, fix the bug in > trink while testing it with the customer installation and if it was > fixed just commit on the development server once for trunk and once > for the customer folder. Only th latter brekas now so it seems I just > have to adjust my workflow to merge the commits from trunk to the > customer in a separate step and folder without the symlinks.
Yes. I would say that a merge is the correct thing to do here anyway in terms of process policy. It seems better to track the fix being merged to each customer-specific branch (is there ever more than one customer branch involved in your case?), rather than having two independent non-merge commits that happen to fix the same problem.
