> --------------------------------------------------
> From: "Bob Archer" <Bob.Archer_at_amsi.com>
> Sent: Thursday, April 21, 2011 11:17 AM
> To: "Daniel Walter" <d2walter_at_hotmail.com>; "Stefan Sperling"
> <stsp_at_elego.de>
> Cc: <users_at_subversion.apache.org>
> Subject: RE: duplicate merge conflict
>
> >> >> 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?
> >
>
>
> ---------------------------------------trunk
> \ \
> \ 4.1 \ 4.2
>
> Both branch 4.1 and 4.2 are copies of the trunk at different
> points.
I'm going to leave it to Stefan to comment on this one. I'm not sure if in this case it will work. 4.2 is not an ancestor of 4.2 but they have a common ancestor.
I think in this case you need to merge 4.1 into trunk then merge trunk into 4.1.
This funky stuff is why we went to the repo organization that I mentioned in a previous email in this thread.
BOb
>
> >>
> >> 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
> >
> With or without specifying revisions and with or without --record-
> only it is
> merging from the beginning of the 4.1 branch to a later point on
> the trunk.
> I am going to get the SVN server updated and try this again thou
I'm not sure if updating the server is going to change anything.
BOb
Received on 2011-04-22 00:07:16 CEST