[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-users
Subject:    Re: catching up to the trunk.
From:       Ryan Schmidt <subversion-2006d () ryandesign ! com>
Date:       2006-10-18 20:47:23
Message-ID: 6D6805ED-9362-4F4C-B63C-DDEC49DA8A6B () ryandesign ! com
[Download RAW message or body]


On Oct 18, 2006, at 09:27, Ruslan Sivak wrote:

> I'm not sure if I'm doing this correctly.  Let's say you are  
> working on a branch.   You want to get the latest changes from  
> trunk because you need/want them in your branch as well and in  
> general want to make sure that it will integrate cleanly with the  
> trunk.
>
> It was my impression that if you do the same change twice, it will  
> just ignore it instead of creating a conflict.  Perhaps its not the  
> same with binary files.
>
> So let's say you are switched to the branch and do a merge from  
> trunk for certain revisions that you want to catch up with.
> After you get those changes into your branch, you test and make  
> sure everything works and then commit everything (including changes  
> merged from trunk) into your branch.
>
> Now you switch to trunk and merge in changes from the branch.   
> Theoretically, it should only end up merging whatever changes were  
> made to the branch, and since the changes that were merged from  
> trunk are already there, it should not modify those files.
> Either I'm doing something wrong or this doesn't work correctly  
> with binary files, but I had a bunch of images which were updated  
> in trunk, merged to the branch, committed to the branch, merged  
> back into trunk, and they all caused conflicts.  This is  
> particularly annoying as there doesn't seem to be a way to resolve  
> these conflicts in subclupse short of reverting which seemed to  
> take forever.

It should work. The fact that it's not suggests you may be running  
the wrong commands. Show us the commands you executed.



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

[prev in list] [next in list] [prev in thread] [next in thread]