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

Merging branches

From: Joe Drew <hoserhead_at_woot.net>
Date: 2003-09-28 22:24:59 CEST

In reading the subversion book, I came across the assertion that in
order to merge from a branch into the trunk, you need to specify
revisions because otherwise "it would not only show the addition of your
branch changes, but also the removal of trunk changes that never
happened on your branch."

However, I don't see how merging only from specific revisions doesn't
also have that same problem. If you branched off at revision N, and
subsequent development happened to the trunk since N, won't that also be
reflected in the sort-of-patches used by merge?

Alternately, since I guess merge only finds patches for that branch in
particular, why is there an issue regarding removal of trunk changes
that never happened on the branch?

Please CC: me; I'm not subscribed to the list.

Joe Drew <hoserhead@woot.net> <drew@debian.org>
My weblog doesn't detail my personal life: http://me.woot.net
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Sep 29 03:10:29 2003

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.