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
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
> > From: Z W [mailto:mpc8250_at_gmail.com]
> > Sent: Wednesday, May 08, 2013 3:05 PM
> > To: users_at_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_at_host branchWC]# svn mergeinfo --show-revs eligible
> > r6554
> > [root_at_host branchWC]# svn merge -c 6554 --record-only
> > [root_at_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:
> 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.)
Received on 2013-05-08 22:09:58 CEST