Re: merge with tree conflict

--- 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, but I find it very convenient. vendor requirement is to remove install directory after installation was done.

>
> Your merge should continue happily beyond this point,
> merging all the
> other needed changes and leaving the install directory for
> you to deal
> with manually. Is this not what you're seeing? Can you post
> more of the
> output from your svn merge command?

You are right, sorry for producing extra noise. Apparently, ALL changes were in 'install' directory and I should have paid more attention to svn diff output.

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?

Thank you,
Vadym

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2402051

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-30 14:40:47 CEST