Stephen McConnell wrote:
> Maybe then I don't understand a revision....
> I have a Release Branch.
> Developers are committing changes to trunk, but an immediate bug fix
> needs to be moved from trunk to the release branch. I need to move
> that specific file with the specific revision number to the release
> branch (the revision number helps me keep track of what changes were
> made where and by whom... I guess that's the purpose of verison
Yes. What you want to do here is merge the change made on the trunk
that fixed the bug onto the branch, with something like:
svn co http://wherever/branches/release_branch_1
svn merge -rN-1:N http://wherever/branches/trunk
Where "N" is the revision made on the trunk that fixed the bug (you
are only comitting related changes together right?). Basically,
what that merge command does is "make the same changes in my
release branch as I made in trunk for revision N".
This is very useful when, for example, a bugfix spans many many files.
In addition, it's useful because it moves across just the change made
for that revision, and not any other changes that might've been made
to the same file in the trunk earlier that you don't want on
your release branch.
> I don't see how moving a file with a revision associated to it to
> another branch violates *core* principles? The revision hasn't
> changed. As a matter of fact, I DON'T want the revision number on the
> file to change.
In Subversion, files don't have individual revision numbers. Whenever
you commit a change to the repository, you increment the repository
revision (the number of changes that have been made to it).
Subversion stores information about at which repository revision a
file gets changed, but it doesn't associate an individual incrementing
revision number with it (well, it does internally, but you never see
that on the client side, and it wouldn't be much use even if you
could, given that there are copies and whatnot that can affect its
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Tue Feb 22 22:34:10 2005