Comments on: Merging Structural Changes http://codex.grimoire.ca/2008/09/28/merging-structural-changes/ Any insufficiently advanced magic is indistinguishable from technology. Mon, 06 Sep 2010 04:30:10 +0000 http://wordpress.org/?v=2.7.1 hourly 1 By: Owen http://codex.grimoire.ca/2008/09/28/merging-structural-changes/comment-page-1/#comment-6 Owen Sun, 28 Sep 2008 18:18:58 +0000 http://codex.grimoire.ca/?p=15#comment-6 Not with Subversion. Reordering the changes so that the content change happens before the structure change still merges the original content on either branch. Subversion's merge implementation takes a list of changes and applies them blindly, without any regard for their order with respect to changes on the target, which is the Right Thing. Not with Subversion. Reordering the changes so that the content change happens before the structure change still merges the original content on either branch. Subversion’s merge implementation takes a list of changes and applies them blindly, without any regard for their order with respect to changes on the target, which is the Right Thing.

]]> By: Idcmp http://codex.grimoire.ca/2008/09/28/merging-structural-changes/comment-page-1/#comment-5 Idcmp Sun, 28 Sep 2008 18:16:27 +0000 http://codex.grimoire.ca/?p=15#comment-5 Hey Owen, The diagrams show changes on trunk/branch at the same time. I'd suspect it's irrelevant, but does order matter? Hey Owen,

The diagrams show changes on trunk/branch at the same time. I’d suspect it’s irrelevant, but does order matter?

]]> By: Owen http://codex.grimoire.ca/2008/09/28/merging-structural-changes/comment-page-1/#comment-4 Owen Sun, 28 Sep 2008 06:53:28 +0000 http://codex.grimoire.ca/?p=15#comment-4 Of course, CVS can't run this test case at all. Of course, CVS can’t run this test case at all.

]]>