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

Re: merge with tree conflict

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 30 Sep 2009 13:51:19 +0100

On Wed, Sep 30, 2009 at 05:40:00AM -0700, Vadym Chepkov wrote:
> --- On Tue, 9/29/09, Tyler Roscoe <tyler_at_cryptio.net> wrote:
> > Why did you remove a directory for a project that you,
> > essentially, do
> > not control?
> I run a web-site out of subversion, some say it's a waste of space,

Not just waste of space. Make sure to read:
(I don't think they should have used the word "vulnerability" in their
title -- they used it to create hype.)

My recommendation is to use 'svn export' and a tool like rsync instead.

> I still see some strange thing, not sure if it's a 'bug' or a 'feature'.
> If I try to apply the same svn merge yet again later, I obviously
> won't get any changes, since nothing has changed under /vendor/
> directory. But, svn merge still modifies svn:mergeinfo of the working
> copy with the revision range that has nothing to do with /vendor/
> branch. Is it expected?

Can you be more specific, please?
What merge command did you run? What mergeinfo on which path did
change in what way and what did you expect to see instead?
Output of 'svn diff' and 'svn status' would help. You can change
URLs and path names if you like, but keep any other information.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-30 14:52:09 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.