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

Re: Commit to trunk and branch in a single commit

From: Karl Heinz Marbaise <kama_at_soebes.de>
Date: Tue, 26 Apr 2011 01:18:55 -0700 (PDT)


André Hänsel wrote:
> Often I have small changes that apply to a branch and the trunk alike. Of
> course I cannot do a normal merge because the local change doesn't have a
> revision number yet.
> If I copy the change from the branch to the trunk or vice versa and then
> commit it in one single commit, will it break merge tracking?
If you commit the change on the branch your change has a revision
number..this means you can do the merge to the trunk....If you do the merge
via svn merge URL/branch the merge tracking works as expected. But in this
case you will merge all changes from branch to trunk but you can limit that
if you need...take a deep look into the Subversion book...

Kind regards
Karl Heinz Marbaise

View this message in context: http://old.nabble.com/Commit-to-trunk-and-branch-in-a-single-commit-tp31476321p31476448.html
Sent from the Subversion Users mailing list archive at Nabble.com.
Received on 2011-04-26 10:19:27 CEST

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.