Re: Re: Re: Subclipse creating .edited file after merge conflict
Mark Phippard <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.subclipse.user |
|---|---|
| Message-ID | <CAHFaGCpkw43Bo-69Yu0XLe1TaULC3U5dy99tR6b9bPUAf-aorQ@mail.gmail.com> |
If you are on Windows, I would recommend using JavaHL anyway. Exception would be if you use SSH to access repository. I emailed the SVNKit team, so probably will not know the issue number. You can keep your eye open here: http://issues.tmatesoft.com/issues/SVNKIT Mark On Tue, Nov 6, 2012 at 3:39 PM, Matthew Hall <[email protected]> wrote: > You are correct, it appears to be an SVNKit issue. When I switch over to JavaHL, I don't see the foo.txt.edited file being created when performing an Update to HEAD operation. Please let me know the SVNKit ticket number when you report the issue as I would like to track its progress. Looks like we'll be switching over to JavaHL in the meantime. Thank you very much for your help! > >> On Tue, Nov 6, 2012 at 3:24 PM, Matthew Hall <ioeth dot trocolar at gmail dot com> wrote: >> > Also not sure if it's important to note, but I'm using the SVNKit Client Adapter 1.7.5.1 with Subclipse. >> >> That is enormously important. See if your recipe happens with JavaHL, >> I do not think it will. When I try it with SVNKit I see the same >> behavior. I will report this as a bug to the SVNKit community. >> >> -- >> Thanks >> >> Mark Phippard >> http://markphip.blogspot.com/ > > ------------------------------------------------------ > http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3026425 > > To unsubscribe from this discussion, e-mail: [[email protected]]. -- Thanks Mark Phippard http://markphip.blogspot.com/ ------------------------------------------------------ http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3026426 To unsubscribe from this discussion, e-mail: [[email protected]].