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

Re: copying from another branch [Question about excessive mergeinfo]

From: Stein Somers <ssomers_at_opnet.com>
Date: Wed, 13 Jan 2010 12:25:39 +0100

On 12/01/2010 10:40, Ulrich Eckhardt wrote:
> Why only merge a part of the initial changeset?

Well, you said I should merge, and I only want a part!

Okay, first of all, I have no question. I just brought this up to
illustrate that excessive mergeinfo exists and you shouldn't assume
you're doing something wrong and you can prevent it from being
committed. I did find your point interesting, but now I don't think you
were making the point I read. But in case you were, here is my
illustration elaborated.

I want a copy of some kind of file set that was shipped to customers,
called /branches/fancy_release/sample_input

I want a copy called /trunk/sample_input_of_fancy_release so I can add
test code to insure that the software is backwards compatibility, at
least for the input I already shipped myself.

I said: URL -> WC copy, but that adds duplicate mergeinfo. You said,
merge the addition. But the changeset that originally added sample_input
contains other stuff I'm not interested in, and I want the final version
of sample_input. So, quite a complicated 2-stage merge process it seemed.

-- 
Stein
Received on 2010-01-13 12:26:14 CET

This is an archived mail posted to the Subversion Users mailing list.