Commit to trunk and branch in a single commit

2011-04-26 Thread André Hänsel
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 trac

Re: Commit to trunk and branch in a single commit

2011-04-26 Thread Karl Heinz Marbaise
se 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 S

AW: Commit to trunk and branch in a single commit

2011-04-26 Thread André Hänsel
> > 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, w

RE: Commit to trunk and branch in a single commit

2011-04-26 Thread Bob Archer
> 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 i