Jay Sachs <jay.sachs@riskmetrics.com> wrote on 10/03/2006 09:24:08 PM:
> On 10/3/06 9:14 PM, "Jay Sachs" <jay.sachs@riskmetrics.com> wrote:
>
> >> Are you a new user? If not did you do merges with previous versions
where
> >> this did not happen? There has not been a lot done in this area in
recent
> >> releases. 1.1.6 added new checkboxes for Ignore Ancestry and Force,
but
> >> other than that there have not been any changes I can recall.
> >
> > I've seen this problem with earlier versions, but at the time was too
intent
> > on getting it done, and did not take the time to report it.
> >
> >> I do merges very regularly.
> >
> > As do I, though apparently we use different tools :-)
> >
> > Which adapter are you using? JavaHL or JavaSVN? If JavaHL, which
version?
>
> Some more information. I get the same error with JavaHL 1.3.1 and 1.4.
> However, using the JavaSVN bundled with 1.1.7, merging from within
Subclipse
> succeeds. Is this a JavaHL bug?
That is really weird. Best I can say is "I don't know". JavaHL is the
same code as the command line so it is hard to see why the command line
would work and JavaHL would fail. Is there anything you think might be
special about your setup or this merge? Maybe you can run svn log --xml
on the revisions you are going to merge and email them. Maybe there is
something about the types of changes. I guess I still come back to that I
would expect javaHL and the command line to behave the same.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Wed Oct 4 15:00:51 2006