> >> Record only should only make changes to the properties and not > the files. > >> You can also just manually update the svn:merginfo on the trunk > if you > >> want. > > > > I think the problem is that because Daniel is using ancestrally > > unrelated trees for the left and right side of his merge diff > there > > is no merge-tracking (just like when the --ignore-ancestry option > is > > used). > > So any options related to merge-tracking (like --record-only) > have no > > effect. > > > > I think that what I am dealing with is ancestrally related now: > > (in 4.2 working copy) svn merge --record-only -r 222:473 > ^/branches/branch4.1
You can verified that branch4.2 is a child (copy of) branch4.1? > > Here I am attempting to generate merge info for the changes since I > started > the branch at r222 up to the point where I figured out everything I > have > been doing wrong r473. > > It seems like --record-only should generate an error if there is a > problem > instead of corrupting my working copy. It is a simple matter to > revert > this, but it is not very useful for understanding what I did wrong. > > I wanted to check my version numbers, to make sure that I am using > recent > versions. My client is 1.6.13. Is there a way to get the server > version > from the svn client? I guess my question is... 1. Can you do the merge --record-only without specifying revisions. 2. What is it corrupting exactly? BOb
