subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tyler Roscoe <ty...@cryptio.net>
Subject Re: weird merge
Date Thu, 25 Mar 2010 15:51:01 GMT
On Thu, Mar 25, 2010 at 11:09:49AM +0100, Xavier Noria wrote:
> That is, after you create branch b from trunk, you work on b,
> occasionally you sync with trunk this way:
> 
>     cd b
>     svn merge ^/trunk .
> 
> and when you are done in b finally
> 
>     cd trunk
>     svn merge --reintegrate ^/branches/b .
> 
> First, that is correct right?

Yes.

>     svn merge ^/trunk .
> 
> instead of being silent says
> 
>     --- Merging r2 through r2909 into '.'
> 
> and then a ton of tree conflicts appear. But that is kind of weird
> because this project is at revision ~28000, why a range from 2 to
> 2909?

For some reason, your branch doesn't know that it already has revisions
2 through 2909, so svn attempts to merge those revisions in, leading
(apparently) to tree conflicts.

You should look at your branch's ancestry to make sure those revisions
are not needed. If they're not, you can use a --record-only merge to
make the branch think it has those revisions. Subsequent merges from
trunk should then skip over those revisions and merge only what you
want.

hth,
tyler

Mime
View raw message