Merge issues

A developer has recently asked me why a particular file didn't get added
when he did the merge, and I simply could not figure out the answer. To me,
it looks like the missing file should have been added to the branch he was
currently working on.

I examined the svn:mergeinfo before and after the merge (to see what was
being considered, and here are the results:

BEFORE
=======
/modules/adsuite/branches/5.3:47938,47999,48002-48003,48005,48198,50578-50623
/modules/adsuite/branches/5.3.0:50624-51944
/modules/adsuite/branches/5.3.0.1:51507-51742
/modules/adsuite/branches/5.3.0.2:51947-52281
/modules/adsuite/branches/ADS-5.3.0.1:51505-51506
/modules/adsuite/tags/DEV/ADS-5.3-D-1422:50578-50657
/modules/adsuite/tags/DEV/ADS-5.3.0-D-1470:51409-51504
/modules/adsuite/tags/DEV/ADS-5.3.0-D-1513:51945-51946
/modules/adsuite/trunk:49878-50577,51780,51850

AFTER
======
/modules/adsuite/branches/5.3:47938,47999,48002-48003,48005,48198,50578-50623
/modules/adsuite/branches/5.3.0:50624-52340
/modules/adsuite/branches/5.3.0.1:51507-51742
/modules/adsuite/branches/5.3.0.2:51947-52281
/modules/adsuite/branches/5.3.0.3:*52380*-52645
/modules/adsuite/branches/ADS-5.3.0.1:51505-51506
/modules/adsuite/tags/DEV/ADS-5.3-D-1422:50578-50657
/modules/adsuite/tags/DEV/ADS-5.3.0-D-1470:51409-51504
/modules/adsuite/tags/DEV/ADS-5.3.0-D-1513:51945-51946
/modules/adsuite/tags/DEV/ADS-5.3.0-D-1551:52341-*52379*
/modules/adsuite/trunk:49878-50577,51780,51850,51869,51967,51999,52085,52296-52297,52301,
*52305*,52328,52338,52417

Here are the changes between the before and after:

/modules/adsuite/branches/5.3.0:51945-52340
/modules/adsuite/branches/5.3.0.3:*52380*-52645
/modules/adsuite/tags/DEV/ADS-5.3.0-D-1551:52341-*52379*
/modules/adsuite/trunk:51869,51967,51999,52085,52296-52967,52301,*52305*
,52328,52338,52417

   - The merge was from the 5.3.0.3 branch to the branch in the developer's
   working copy (ib-21848)
   - The branch the developer was working on (ib-21848) was copied from the
   trunk (revision 49877) in revision 49878.
   - The 5.3.0 branch was copied from the trunk in revision 50577
   - The missing file was added to the trunk in revision 52305
   - The missing file was added to the 5.3.0 branch in revision 52306 and
   were copied from the trunk (rev 52305).
   - The ADS-5.3.0-D-1551 tag was copied from the 5.3.0 branch in revision
   52340. (Thus the missing files were there when the tag was created)
   - The 5.3.0.3 branch was copied from ADS-5.3.0-D-1551 tag (revision
   52379) in revision 52380. (Thus the missing file was there when this branch
   was created)

So, why didn't this file, which was in the trunk, and all the other branches
not added to the branch which the developer was working on?

-- 
David Weintraub
qazwart_at_gmail.com
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2355896
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].