Discussions  >  CollabNet Subversion Client  >  RE: Re: Tree conflict during Reintegrate a Branch

Back to topic list

RE: Re: Tree conflict during Reintegrate a Branch

Author bbcompent1 (OCN Member)
Full name Dan Brewerton
Date 2012-03-01 10:39:38 PST
Message Tortoise did do something AnkhSVN doesn't. It actually asks to update the version of the branch to match. Then the merge goes through.

> For kicks, I decided to try this with TortoiseSVN. The error is a heck of a lot more clear.
>
> "Error: Cannot merge into mixed-revision working copy [1029:1031]; try updating first"
>
> Branch is at version 1029
> Trunk is at version 1031

« Previous message in topic | 6 of 9 | Next message in topic »

Messages

Show all messages in topic

Tree conflict during Reintegrate a Branch bbcompent1 (OCN Member) Dan Brewerton 2012-03-01 08:39:08 PST
     Re: Tree conflict during Reintegrate a Branch jeyanthan (OCN Member) Jeyanthan I 2012-03-01 09:34:50 PST
         RE: Re: Tree conflict during Reintegrate a Branch bbcompent1 (OCN Member) Dan Brewerton 2012-03-01 09:57:06 PST
             Re: Tree conflict during Reintegrate a Branch markphip (OCN Member) Mark Phippard 2012-03-01 10:00:47 PST
                 RE: Re: Tree conflict during Reintegrate a Branch bbcompent1 (OCN Member) Dan Brewerton 2012-03-01 10:38:26 PST
                     RE: Re: Tree conflict during Reintegrate a Branch bbcompent1 (OCN Member) Dan Brewerton 2012-03-01 10:39:38 PST
                         RE: Re: Tree conflict during Reintegrate a Branch bbcompent1 (OCN Member) Dan Brewerton 2012-03-01 10:53:31 PST
                     Re: Tree conflict during Reintegrate a Branch markphip (OCN Member) Mark Phippard 2012-03-01 10:41:27 PST
                         RE: Re: Tree conflict during Reintegrate a Branch bbcompent1 (OCN Member) Dan Brewerton 2012-03-02 06:54:44 PST
Messages per page: