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

merge option needs to be able to handle multiple change sets?

From: JetMark <extrapic_at_extrapic.com>
Date: Wed, 23 Jul 2008 02:37:25 -0700 (PDT)

If I do some merges I can do as follows:

svn merge -c15 repo/branch
svn merge -c20 repo/branch
svn merge -c35 repo/branch
svn merge -c17 repo/branch

But it is not possible to dry run these:

svn merge -c15,20,35,17 repo/branch

does not work. This seems intentional, but its something really needed in
order to calculate weather executing a merge gives G or C files. Come to
that it would be very useful to be able to actually do as one command. In
fact I think there ought to be a command to read an arbitrary changeset list
from a file when doing either wet or dry run merges.

There is also no way that I know of to synthesize the dry run result from a
number of dry runs, the order of the merge can be important and not allowing
multiples takes order out of the equation.

But it seems like the omission of multiple changesets is so obvious that it
MUST be intentional, or is it just that I missed some vital option or that
the help is not up to date. What is even odder is that the pre 1.5
svnmerge.py tool, explicitly DID allow this type of thing. Ive not used the
svnmerge.py tool, and my understanding is that it is discouraged with 1.5
because 1.5 is supposed to provide better inbuilt facilities.

So, can someone tell me what the outlook for this is. A clearly needed
facility intentionally not implemented? Will it and can it be?

View this message in context: http://www.nabble.com/merge-option-needs-to-be-able-to-handle-multiple-change-sets--tp18607129p18607129.html
Sent from the Subversion Users mailing list archive at Nabble.com.
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-23 11:37:47 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.