> 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.)
