[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Some observations while branching and merging...

From: Olivier Dagenais <olivier.dagenais_at_formark.com>
Date: 2007-05-08 14:40:21 CEST

> My only observation is that each revision should be a logically
> distinct operation, but in step 6, you committed a revision that does
> two logically distinct operations: you created a branch, and you made
> a change to it by adding a file. Instead, you should create the
> branch from the trunk in one revision, and then in the next revision
> you can make changes to it if you like. By combining these two
> operations in one revision you make it hard to properly merge changes
> from that branch to elsewhere.

Right, I did wonder about that.

Round 3, however, has the branching as a distinct operation and is the scenario that puzzles us the most. Are we doing something incorrectly?


Olivier Dagenais
Software Engineering / Génie logiciel
Formark - Combine the Best of SharePoint® and Livelink®
Phone: 613-599-5173 ext 238
Make sure you don't miss anything: subscribe to the Formark Newsletter:
Received on Tue May 8 14:38:42 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.