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

AW: Commit to trunk and branch in a single commit

From: André Hänsel <andre_at_webkr.de>
Date: Tue, 26 Apr 2011 10:34:01 +0200

> > 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.

Thanks. I wasn't sure if svn will report it as a conflict because the file is already changed but the merge is not yet tracked. But I guess it's the same as when two developers make an identical change.
Received on 2011-04-26 10:34:38 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.