On Fri, 2005-02-11 at 10:06 -0800, Mike Stump wrote: > On Thursday, February 10, 2005, at 03:42 PM, Daniel Berlin wrote: > > > On Thu, 2005-02-10 at 15:25 -0800, Mike Stump wrote: > >> On Feb 9, 2005, at 8:54 PM, Daniel Berlin wrote: > >>> I also plan on excluding merge tags > >> > >> The last merge tag on active branches should be kept, as they would be > >> used for the next merge?! > > > > Uh, you don't need a tag to merge anymore. > > How could it know what to merge?
> Take for example, the > apple-ppc-branch for example. Find the current revision of the apple-ppc-branch using svn info on your checked out copy. >From your checked out copy of the apple ppc branch, type: "svn merge -r<current rev that tells you>:HEAD svn://svn.toolchain.org/svn/gcc/trunk " That will merge in all the changes from the HEAD since the last time you merged. In general, you don't need a tag to merge, you just need the last global revision number for your current tree (unlike cvs, where you *have* to tag every file so you have a global set of revision numbers). There is actually a tool that automates this using properties so you don't need to remember anything at all, and also lets you cherry pick revisions if you want to. http://www.dellroad.org/svnmerge/index Even further automated history tracking is planned for future versions of subversion.
