RE: Tortoise SVN merge bug?
Empty ranges are what is the norm. What version of svn client / server are you using? BOb -Original Message- From: Jeff Abbott [mailto:jeff.abb...@caemilusa.com] Sent: Monday, February 01, 2010 8:18 PM To: Bob Archer; users@subversion.apache.org Subject: RE: Tortoise SVN merge bug? Well I created my branch today, but the svn history goes back many years. I checked the revisions that were merged and they correspond to the PTRs that were previously merged manually, two of them in the last couple of weeks. But I think I understand the problem now. Empty ranges and manual merges are bad. Thanks, Jeff From: Bob Archer [mailto:bob.arc...@amsi.com] Sent: Mon 2/1/2010 7:21 PM To: Jeff Abbott; users@subversion.apache.org Subject: RE: Tortoise SVN merge bug? I'm afraid it does but I'm not counting out user error quite yet. Yes I am merging to my working copy of the trunk. I created a branch from my trunk, and checked it out. The first revision of the branch is 3221. Then I added a text file named my test.txt and put the word test in the file. I then select merge as follows: I assume before you do the merge you have commited your mytest.txt files change on branch? I right click on my trunk check out and select merge a range of revisions and enter the URL to my branch. Next I don't enter revisions any and run the Test Merge. Then I get the following output: Merging r2 through r1761: [path] [long list of files updated, merged, conflicted] Merging r1798 through r3052: [path] [long list of files updated, merged, conflicted] Merging r3053 through r3220: [path] [long list of files updated, merged, conflicted] Merging r3221 through r3223: [path] I get is a single Added line before it completes. Added: [path]\New File.txt Completed: [path] I close the Merge test and click on back then select Show Log and select the range of revisions. Click Next and run Test Merge again, Merging r3221 through r3223: [path] all I get is a single Added line before it completes. Added: [path]\New File.txt Completed: [path] So I'm concluding merging a branch does not merge back to the parent from which it was branched, but from the parent of all parents from which our trunk originated 5 years ago. So To merge all revisions, leave the box empty. means merge this branch all the way back to the first checkin that ever occurred in the repository? Ok, so you created this branch well before you started using svn 1.5? This would explain why it works when you specify the revisions. What you need to do is first do a merge and specify the revisions (from:to) for everything that you have manually merged and do a record only merge? From your logs it looks like you need to do a record only merge from r2:r3221. Then commit it. That will tell svn that r2-r3221 of trunk is already in trunk. (I assume this is the case.) Our repository has four root entries: cm/[releases] dev/[older trunks] ptr/[issue track number or each PTR] trunk I am merging ptr branches created off of the trunk. But the merge merges the branck back to the original ptr branch that is revision 2 under which I had created my branch folder. Now I'm guessing I have lost you here, but if you do see my mistake please set me straight. Jeff ***This e-mail message is intended only for the above named recipient(s) and may contain information that is sensitive or proprietary. If you have received this message in error or are not the named recipient(s), please immediately notify the sender, delete this e-mail message without making a copy and do not disclose or relay this e-mail message to anyone.***
RE: Tortoise SVN merge bug?
Here is the version info: TortoiseSVN 1.6.6, Build 17493 - 32 Bit , 2009/10/19 20:22:18 Subversion 1.6.6, apr 1.3.8 apr-utils 1.3.9 neon 0.28.6 OpenSSL 0.9.8k 25 Mar 2009 zlib 1.2.3 The problem is we rarely use SVN merge when there are conflicts. So if I understand correctly the appropriate merge history is not available? Jeff From: Bob Archer [mailto:bob.arc...@amsi.com] Sent: Tue 2/2/2010 9:31 AM To: Jeff Abbott; users@subversion.apache.org Subject: RE: Tortoise SVN merge bug? Empty ranges are what is the norm. What version of svn client / server are you using? BOb -Original Message- From: Jeff Abbott [mailto:jeff.abb...@caemilusa.com] Sent: Monday, February 01, 2010 8:18 PM To: Bob Archer; users@subversion.apache.org Subject: RE: Tortoise SVN merge bug? Well I created my branch today, but the svn history goes back many years. I checked the revisions that were merged and they correspond to the PTRs that were previously merged manually, two of them in the last couple of weeks. But I think I understand the problem now. Empty ranges and manual merges are bad. Thanks, Jeff From: Bob Archer [mailto:bob.arc...@amsi.com] Sent: Mon 2/1/2010 7:21 PM To: Jeff Abbott; users@subversion.apache.org Subject: RE: Tortoise SVN merge bug? I'm afraid it does but I'm not counting out user error quite yet. Yes I am merging to my working copy of the trunk. I created a branch from my trunk, and checked it out. The first revision of the branch is 3221. Then I added a text file named my test.txt and put the word test in the file. I then select merge as follows: I assume before you do the merge you have commited your mytest.txt files change on branch? I right click on my trunk check out and select merge a range of revisions and enter the URL to my branch. Next I don't enter revisions any and run the Test Merge. Then I get the following output: Merging r2 through r1761: [path] [long list of files updated, merged, conflicted] Merging r1798 through r3052: [path] [long list of files updated, merged, conflicted] Merging r3053 through r3220: [path] [long list of files updated, merged, conflicted] Merging r3221 through r3223: [path] I get is a single Added line before it completes. Added: [path]\New File.txt Completed: [path] I close the Merge test and click on back then select Show Log and select the range of revisions. Click Next and run Test Merge again, Merging r3221 through r3223: [path] all I get is a single Added line before it completes. Added: [path]\New File.txt Completed: [path] So I'm concluding merging a branch does not merge back to the parent from which it was branched, but from the parent of all parents from which our trunk originated 5 years ago. So To merge all revisions, leave the box empty. means merge this branch all the way back to the first checkin that ever occurred in the repository? Ok, so you created this branch well before you started using svn 1.5? This would explain why it works when you specify the revisions. What you need to do is first do a merge and specify the revisions (from:to) for everything that you have manually merged and do a record only merge? From your logs it looks like you need to do a record only merge from r2:r3221. Then commit it. That will tell svn that r2-r3221 of trunk is already in trunk. (I assume this is the case.) Our repository has four root entries: cm/[releases] dev/[older trunks] ptr/[issue track number or each PTR] trunk I am merging ptr branches created off of the trunk. But the merge merges the branck back to the original ptr branch that is revision 2 under which I had created my branch folder. Now I'm guessing I have lost you here, but if you do see my mistake please set me straight. Jeff ***This e-mail message is intended only for the above named recipient(s) and may contain information that is sensitive or proprietary. If you have received this message in error or are not the named recipient(s), please immediately notify the sender, delete this e-mail message without making a copy and do not disclose or relay this e-mail message to anyone.***
RE: Tortoise SVN merge bug?
I'm afraid it does but I'm not counting out user error quite yet. Yes I am merging to my working copy of the trunk. I created a branch from my trunk, and checked it out. The first revision of the branch is 3221. Then I added a text file named my test.txt and put the word test in the file. I then select merge as follows: I right click on my trunk check out and select merge a range of revisions and enter the URL to my branch. Next I don't enter revisions any and run the Test Merge. Then I get the following output: Merging r2 through r1761: [path] [long list of files updated, merged, conflicted] Merging r1798 through r3052: [path] [long list of files updated, merged, conflicted] Merging r3053 through r3220: [path] [long list of files updated, merged, conflicted] Merging r3221 through r3223: [path] I get is a single Added line before it completes. Added: [path]\New File.txt Completed: [path] I close the Merge test and click on back then select Show Log and select the range of revisions. Click Next and run Test Merge again, Merging r3221 through r3223: [path] all I get is a single Added line before it completes. Added: [path]\New File.txt Completed: [path] So I'm concluding merging a branch does not merge back to the parent from which it was branched, but from the parent of all parents from which our trunk originated 5 years ago. So To merge all revisions, leave the box empty. means merge this branch all the way back to the first checkin that ever occurred in the repository? Our repository has four root entries: cm/[releases] dev/[older trunks] ptr/[issue track number or each PTR] trunk I am merging ptr branches created off of the trunk. But the merge merges the branck back to the original ptr branch that is revision 2 under which I had created my branch folder. Now I'm guessing I have lost you here, but if you do see my mistake please set me straight. Jeff From: Bob Archer [mailto:bob.arc...@amsi.com] Sent: Mon 2/1/2010 6:07 PM To: Bob Archer; Jeff Abbott; users@subversion.apache.org Subject: RE: Tortoise SVN merge bug? When I select merge I get three options. The first option Merge a range of revisions produces varied results. If you want to merge an entire branch back to the trunk (from where it was branched), it actually does a revert when you follow the instructions To merge all revisions, leave the No it doesn't. Unless the path you are merging to is not the path that you coppied the branch from. Are you selecting Merge from the WC of the trunk? Also, if you are merging trunk TO branch... then want to merge branch back to trunk make sure you selected Reintegrate check box. BOb box empty. If you enter the revision range then it does work. I suspect if you leave it blank and check Reverse merge it would work also. Jeff ***This e-mail message is intended only for the above named recipient(s) and may contain information that is sensitive or proprietary. If you have received this message in error or are not the named recipient(s), please immediately notify the sender, delete this e-mail message without making a copy and do not disclose or relay this e-mail message to anyone.***
RE: Tortoise SVN merge bug?
I'm afraid it does but I'm not counting out user error quite yet. Yes I am merging to my working copy of the trunk. I created a branch from my trunk, and checked it out. The first revision of the branch is 3221. Then I added a text file named my test.txt and put the word test in the file. I then select merge as follows: I assume before you do the merge you have commited your mytest.txt files change on branch? I right click on my trunk check out and select merge a range of revisions and enter the URL to my branch. Next I don't enter revisions any and run the Test Merge. Then I get the following output: Merging r2 through r1761: [path] [long list of files updated, merged, conflicted] Merging r1798 through r3052: [path] [long list of files updated, merged, conflicted] Merging r3053 through r3220: [path] [long list of files updated, merged, conflicted] Merging r3221 through r3223: [path] I get is a single Added line before it completes. Added: [path]\New File.txt Completed: [path] I close the Merge test and click on back then select Show Log and select the range of revisions. Click Next and run Test Merge again, Merging r3221 through r3223: [path] all I get is a single Added line before it completes. Added: [path]\New File.txt Completed: [path] So I'm concluding merging a branch does not merge back to the parent from which it was branched, but from the parent of all parents from which our trunk originated 5 years ago. So To merge all revisions, leave the box empty. means merge this branch all the way back to the first checkin that ever occurred in the repository? Ok, so you created this branch well before you started using svn 1.5? This would explain why it works when you specify the revisions. What you need to do is first do a merge and specify the revisions (from:to) for everything that you have manually merged and do a record only merge? From your logs it looks like you need to do a record only merge from r2:r3221. Then commit it. That will tell svn that r2-r3221 of trunk is already in trunk. (I assume this is the case.) Our repository has four root entries: cm/[releases] dev/[older trunks] ptr/[issue track number or each PTR] trunk I am merging ptr branches created off of the trunk. But the merge merges the branck back to the original ptr branch that is revision 2 under which I had created my branch folder. Now I'm guessing I have lost you here, but if you do see my mistake please set me straight. Jeff
RE: Tortoise SVN merge bug?
Well I created my branch today, but the svn history goes back many years. I checked the revisions that were merged and they correspond to the PTRs that were previously merged manually, two of them in the last couple of weeks. But I think I understand the problem now. Empty ranges and manual merges are bad. Thanks, Jeff From: Bob Archer [mailto:bob.arc...@amsi.com] Sent: Mon 2/1/2010 7:21 PM To: Jeff Abbott; users@subversion.apache.org Subject: RE: Tortoise SVN merge bug? I'm afraid it does but I'm not counting out user error quite yet. Yes I am merging to my working copy of the trunk. I created a branch from my trunk, and checked it out. The first revision of the branch is 3221. Then I added a text file named my test.txt and put the word test in the file. I then select merge as follows: I assume before you do the merge you have commited your mytest.txt files change on branch? I right click on my trunk check out and select merge a range of revisions and enter the URL to my branch. Next I don't enter revisions any and run the Test Merge. Then I get the following output: Merging r2 through r1761: [path] [long list of files updated, merged, conflicted] Merging r1798 through r3052: [path] [long list of files updated, merged, conflicted] Merging r3053 through r3220: [path] [long list of files updated, merged, conflicted] Merging r3221 through r3223: [path] I get is a single Added line before it completes. Added: [path]\New File.txt Completed: [path] I close the Merge test and click on back then select Show Log and select the range of revisions. Click Next and run Test Merge again, Merging r3221 through r3223: [path] all I get is a single Added line before it completes. Added: [path]\New File.txt Completed: [path] So I'm concluding merging a branch does not merge back to the parent from which it was branched, but from the parent of all parents from which our trunk originated 5 years ago. So To merge all revisions, leave the box empty. means merge this branch all the way back to the first checkin that ever occurred in the repository? Ok, so you created this branch well before you started using svn 1.5? This would explain why it works when you specify the revisions. What you need to do is first do a merge and specify the revisions (from:to) for everything that you have manually merged and do a record only merge? From your logs it looks like you need to do a record only merge from r2:r3221. Then commit it. That will tell svn that r2-r3221 of trunk is already in trunk. (I assume this is the case.) Our repository has four root entries: cm/[releases] dev/[older trunks] ptr/[issue track number or each PTR] trunk I am merging ptr branches created off of the trunk. But the merge merges the branck back to the original ptr branch that is revision 2 under which I had created my branch folder. Now I'm guessing I have lost you here, but if you do see my mistake please set me straight. Jeff ***This e-mail message is intended only for the above named recipient(s) and may contain information that is sensitive or proprietary. If you have received this message in error or are not the named recipient(s), please immediately notify the sender, delete this e-mail message without making a copy and do not disclose or relay this e-mail message to anyone.***
