[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: Bob Archer <Bob.Archer_at_amsi.com>
Date: Tue, 26 Apr 2011 09:34:30 -0400

> 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 do commit the same change manually to trunk and branch and then you try to do a merge you will get a conflict. You can do a --record-only merge after the fact to resolve that problem though. Or just deal with the conflict when you do finally merge.

Received on 2011-04-26 15:35:04 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.