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

Re: Merge conflicts files that weren't modified

From: Bob Hiestand <bob.hiestand_at_gmail.com>
Date: 2006-12-19 22:30:29 CET

On 12/19/06, Denny Caldwell <dcaldwell@grinn.net> wrote:

> /branches/client1 created from trunk rev 5
> /trunk modified 30 files, rev 7
>
> merge:
> from url: /trunk, rev: 5
> to url: /trunk, rev: HEAD
> destination: /branches/client1
> (no conflicts, all goes well, 30 files modified.)
>
> /branches/client1 modified 5 files, rev 9
> /trunk modified 50 files, rev 10
>
> merge:
> from url: /trunk, rev: 5
> to url: /trunk, rev: HEAD
> destination: /branches/client1
>
> I get conflicts on 12 files, most of them which were not even modified in
> client1 since the last merge!
>
> I can only guess that it's because those files were modified during the
> *previous* merge, in rev 8. If this is the case, how can I sell svn, "Hey! I
> only need to keep the revisions I've made to the destination since my last
> merge."?

That is exactly correct. The second merge should start in rev: 7,
since you've already merged the changes up to 7 in the first merge.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 19 22:31:05 2006

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