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

how can it merge revisions committed before the branch was forked?

From: Victor Sudakov <vas_at_mpeks.tomsk.su>
Date: Thu, 17 May 2012 22:18:23 +0700

Colleagues,

I created a branch by running "svn copy trunk branches/FOO" in my
working copy and committed the new files, which created revison 3053.
Then I modified some files in both locations. When I run "svn
mergeinfo" in branches/FOO, it shows the following revisions for
merging:
r3041
r3051
r3054
r3055

Why does it suggest merging revisions which were committed before
branches/FOO was even forked? When I tried to merge nonetheless, some weird
conflicts arose. Have I done something wrong?

-- 
Victor Sudakov,
VAS4-RIPE, VAS47-RIPN sip:sudakov_at_sibptus.tomsk.ru
Received on 2012-05-17 17:19:01 CEST

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