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

Re: merging trunk to a feature branch (conflicts on a directory)

From: David Durham <david.durham.jr_at_gmail.com>
Date: Wed, 21 Oct 2009 14:44:03 -0500

The issues mentioned in the email below has been resolved. It's
probably not clear from what I've described, but the solution was to
"merge two different trees". Basically I wanted the delta for 2 tags
against trunk to be merged with my branch.

-Dave

On Wed, Oct 21, 2009 at 1:53 PM, David Durham <david.durham.jr_at_gmail.com> wrote:
> Hi all,
>
> I'm trying to merge changes that were made to a project trunk with a
> local working copy (that is synchronized with a branch).  I executed
> the following from the root of my project directory:
>
>    svn merge https://mysvn/myproject/trunk
>
> So that came back with some info about conflicts.  What I get now with a:
>
>    svn status
>
> is:
>
> $ svn status
> !     C src
>      >   local add, incoming add upon merge
>
> src is a directory that exists on trunk and my branch, always has.
>
> What I'd like it to do is add the files that I don't have and tell me
> about the files that need to be merged manually.  Anyone to coax the
> tool into doing this?
>
> Thanks,
> Dave
>

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-21 21:45:08 CEST

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