On May 4, 2007, at 07:56, Olivier Dagenais wrote:
> 1 - Performs a checkout of "bikeshed" (revision 355).
> 2 - Adds a "trunk" folder.
> 3 - Adds a "paint.colour" file.
> 4 - Commits at revision 356.
> 5 - Branches "trunk" to "branch" at revision 356 and adds the
> "brush.type" file.
> 6 - Commits at revision 357.
> 7 - Adds the "roof.composition" file in "trunk".
> 8 - Commits at revision 358.
> 9 - Deletes the "paint.colour" file from the "trunk".
> 10 - Commits at revision 359.
> 11 - Performs a "pull merge" to get the changes from "trunk" into
> their "branch".
> 12 - Commits at revision 360.
> 13 - Performs a "push merge" to have their "branch" be incorporated
> into "trunk".
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.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun May 6 00:49:06 2007