Re: Re: Merge/reintegrate issue with 1.8.1
Mark Phippard <[email protected]> Tue, 27 Aug 2013 16:48:11 -0400
| Newsgroups | gmane.comp.version-control.subversion.subclipse.user |
|---|---|
| Message-ID | <CAHFaGCrc_NBZCpZC7o6qUcZkLEtVWGf25Od7nCnJ5F=SU6JfaA@mail.gmail.com> |
On Tue, Aug 27, 2013 at 4:45 PM, Jacob Weber <[email protected]> wrote: > Yep, Subclipse 1.10.1, and CollabNet Merge Client 4.0.1. > > I'm checking out and merging from the same branches in both examples. > > The only difference is that I checked out separate working copies of trunk > using the command line and Subclipse, so I could test both. > > I also tried running the command-line merge on the working copy that I > checked out using Subclipse. The merge still works on the command-line. > > I remember having this problem with SVN 1.8.0, even on the command-line. > But 1.8.1 fixed it, and Subclipse is using the 1.8.1 version of JavaHL, > according to the preferences page. > > FYI, the server is still 1.7.x, if that matters. > The server version does not matter. -- Thanks Mark Phippard http://markphip.blogspot.com/ ------------------------------------------------------ http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3063426 To unsubscribe from this discussion, e-mail: [[email protected]].