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

Re: [TSVN] Merging multiple revisions

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-09-21 02:43:13 CEST

"Douglas Stonham" <dstonham@pennysaverusa.net> wrote on 09/20/2005
07:55:33 PM:

> Today I had to run a merge of revisions 930-934, 955, 959-970, 974,
> 977-978, 989-990, 993-994, 1002-1003, 1010, 1014-1015, 1020-1024 from
the
> trunk to a branch...
>
> The feature which spanned all those revisions should really have been a
> branch I guess but I really didn't know at the time that it would take
> that long.
>
> Back story aside I was hoping there could be an easy way of doing this?
> The "Show Log" option on the Merge dialog is great, but it doesn't allow
> the selection of discontinuous revisions (or rather does, but just uses
> the start and end points).
>
> Is there any way that this can be extended to allow a discontinous list
of
> revisions to be merged in one operation?

The Subversion merge command does not support that. The only way this
could be done is to execute multiple merge commands. I think that would
be a bad idea for TSVN to "just do". For one thing, you can get false
conflicts due to the local modification from the previous merge. When I
have to do this, I usually do one range at a time, followed by a commit,
but it also depends on what I am merging.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Sep 21 02:43:50 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.