RE: How to remove revision number in mergeinfo eligible list
From: Z W [mailto:mpc8...@gmail.com] Sent: Wednesday, May 08, 2013 8:25 PM To: Andrew Reedick Cc: users@subversion.apache.org Subject: Re: How to remove revision number in mergeinfo eligible list Hi Andrew Thanks for taking the time to respond. We did as told step by step and the result is the same - revision number is still in eligible list at the final step [root@host newbranchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk r6554 r9946 [root@host newbranchWC]# svn propget svn:mergeinfo . /root/trunk:6560,9804,9806,9836,9874-9876,9880-9881,9899-9900,9951-9952 [root@host newbranchWC]# svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk [root@host newbranchWC]# svn propget svn:mergeinfo . /root/trunk:6560,9804,9806,9836,9874-9876,9880-9881,9899-9900,9951-9952 [root@host newbranchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk r6554 r9946 We wonder if it has to do with the rev number change itself. That 6554 rev number is about /root/Trunk creation from svn mkdir The following rev number 6560 is about renaming /root/Trunk to /root/trunk Then the following rev number 9804 is about svn copy of dir A to https://some.url.com/svn/root/trunk/A Then the following rev number 9806 is about svn copy of dir B to https://some.url.com/svn/root/trunk/B Would such actions impact the very first rev number for folder https://some.url.com/svn/root/Trunk ? We use SVN 1.6 The good news is that I was able to do a merge that produced output similar to yours. The bad news is that you are probably merging unrelated branches... What branch is your workspace set to? (svn info) And what is the common ancestor between /root/Trunk and the workspace branch? You can try 'svn merge --ignore-ancestry', but I don't think it will make a difference since your branches are probably very unrelated. In other words, 'svn merge' should have produced some output. The fact that it didn't implies that there was no merging to be done. I have no idea why 'svn mergeinfo --show-rev eligible' would still list revs.
RE: How to remove revision number in mergeinfo eligible list
From: Z W [mailto:mpc8...@gmail.com] Sent: Wednesday, May 08, 2013 3:05 PM To: users@subversion.apache.org Subject: How to remove revision number in mergeinfo eligible list Hi All We use SVN 1.6 We have a revision number which refuses to move to the merged list after applying a merge. [root@host branchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk r6554 [root@host branchWC]# svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk [root@host branchWC]# svn propget svn:mergeinfo . It returns empty. How do we remove revision number in mergeinfo eligible list or force it to move to the merged list ? We cannot use regular merge for this rev number, unfortunately. Any help is appreciated. Sincerely That's odd. Compare the pre-merge svn:mergeinfo with the post-merge copy to see if anything was changed: svn propget svn:mergeinfo https://.../root/trunk a.txt svn propget svn:mergeinfo . b.txt diff a.txt b.txt If you run mergeinfo again (after the merge), does 6554 still show up in the list? svn mergeinfo ... | grep 6554 Do you see a trailing asterisk (*) for the branch in svn:mergeinfo? Ex: /branches/1.0:3166-3179* If so, then there might be some quirk in how svn is recording a partially merged range. Is it missing from all the svn:mergeinfo properties? (Run 'svn status' and run 'svn propget...' on the dirs with a 'M' in the second column.)
Re: How to remove revision number in mergeinfo eligible list
Hi Andrew Thanks for responding; appreciate it. We followed your instruction - svn propget svn:mergeinfo https://.../root/trunk a.txt svn propget svn:mergeinfo . b.txt diff a.txt b.txt a.txt returns an empty file b.txt returns empty too. The revision number 6554 change is about the creation of the trunk (https://.../root/trunk). In this trunk it has 2 directories A and B. In our working copy directory, it has directories A and B, too. We're trying to merge from the trunk to working copy branch svn mergeinfo ... | grep 6554 returns empty. On Wed, May 8, 2013 at 12:40 PM, Andrew Reedick andrew.reed...@cbeyond.netwrote: From: Z W [mailto:mpc8...@gmail.com] Sent: Wednesday, May 08, 2013 3:05 PM To: users@subversion.apache.org Subject: How to remove revision number in mergeinfo eligible list Hi All We use SVN 1.6 We have a revision number which refuses to move to the merged list after applying a merge. [root@host branchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk r6554 [root@host branchWC]# svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk [root@host branchWC]# svn propget svn:mergeinfo . It returns empty. How do we remove revision number in mergeinfo eligible list or force it to move to the merged list ? We cannot use regular merge for this rev number, unfortunately. Any help is appreciated. Sincerely That's odd. Compare the pre-merge svn:mergeinfo with the post-merge copy to see if anything was changed: svn propget svn:mergeinfo https://.../root/trunk a.txt svn propget svn:mergeinfo . b.txt diff a.txt b.txt If you run mergeinfo again (after the merge), does 6554 still show up in the list? svn mergeinfo ... | grep 6554 Do you see a trailing asterisk (*) for the branch in svn:mergeinfo? Ex: /branches/1.0:3166-3179* If so, then there might be some quirk in how svn is recording a partially merged range. Is it missing from all the svn:mergeinfo properties? (Run 'svn status' and run 'svn propget...' on the dirs with a 'M' in the second column.)
RE: How to remove revision number in mergeinfo eligible list
From: Z W [mailto:mpc8...@gmail.com] Sent: Wednesday, May 08, 2013 4:09 PM To: Andrew Reedick Cc: users@subversion.apache.org Subject: Re: How to remove revision number in mergeinfo eligible list Hi Andrew Thanks for responding; appreciate it. We followed your instruction - svn propget svn:mergeinfo https://.../root/trunk a.txt svn propget svn:mergeinfo . b.txt diff a.txt b.txt a.txt returns an empty file b.txt returns empty too. The revision number 6554 change is about the creation of the trunk (https://.../root/trunk). In this trunk it has 2 directories A and B. In our working copy directory, it has directories A and B, too. We're trying to merge from the trunk to working copy branch svn mergeinfo ... | grep 6554 returns empty. Okay... let's try this again. 1. checkout a clean workspace. 2. cd workspace 3. svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk pre-mergeinfo.txt 4. svn propget svn:mergeinfo . pre-prop.txt 5. svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk 6. svn propget svn:mergeinfo . post-prop.txt 7. svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk post-mergeinfo.txt 8. diff pre-mergeinfo.txt post-mergeinfo.txt I expect r6554 to be in pre-mergeinfo.txt and not in post-mergeinfo.txt. 9. diff pre-prop.txt post-prop.txt If these files are different, then svn:mergeinfo was updated.
Re: How to remove revision number in mergeinfo eligible list
Hi Andrew Thanks for taking the time to respond. We did as told step by step and the result is the same - revision number is still in eligible list at the final step [root@host newbranchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk r6554 r9946 [root@host newbranchWC]# svn propget svn:mergeinfo . /root/trunk:6560,9804,9806,9836,9874-9876,9880-9881,9899-9900,9951-9952 [root@host newbranchWC]# svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk [root@host newbranchWC]# svn propget svn:mergeinfo . /root/trunk:6560,9804,9806,9836,9874-9876,9880-9881,9899-9900,9951-9952 [root@host newbranchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk r6554 r9946 We wonder if it has to do with the rev number change itself. That 6554 rev number is about /root/Trunk creation from svn mkdir The following rev number 6560 is about renaming /root/Trunk to /root/trunk Then the following rev number 9804 is about svn copy of dir A to https://some.url.com/svn/root/trunk/A Then the following rev number 9806 is about svn copy of dir B to https://some.url.com/svn/root/trunk/B Would such actions impact the very first rev number for folder https://some.url.com/svn/root/Trunk ? We use SVN 1.6 Sincerely On Wed, May 8, 2013 at 2:34 PM, Andrew Reedick andrew.reed...@cbeyond.netwrote: From: Z W [mailto:mpc8...@gmail.com] Sent: Wednesday, May 08, 2013 4:09 PM To: Andrew Reedick Cc: users@subversion.apache.org Subject: Re: How to remove revision number in mergeinfo eligible list Hi Andrew Thanks for responding; appreciate it. We followed your instruction - svn propget svn:mergeinfo https://.../root/trunk a.txt svn propget svn:mergeinfo . b.txt diff a.txt b.txt a.txt returns an empty file b.txt returns empty too. The revision number 6554 change is about the creation of the trunk (https://.../root/trunk). In this trunk it has 2 directories A and B. In our working copy directory, it has directories A and B, too. We're trying to merge from the trunk to working copy branch svn mergeinfo ... | grep 6554 returns empty. Okay... let's try this again. 1. checkout a clean workspace. 2. cd workspace 3. svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk pre-mergeinfo.txt 4. svn propget svn:mergeinfo . pre-prop.txt 5. svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk 6. svn propget svn:mergeinfo . post-prop.txt 7. svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk post-mergeinfo.txt 8. diff pre-mergeinfo.txt post-mergeinfo.txt I expect r6554 to be in pre-mergeinfo.txt and not in post-mergeinfo.txt. 9. diff pre-prop.txt post-prop.txt If these files are different, then svn:mergeinfo was updated.
