Re: Problem with merge --reintegrate

2017-12-23 Thread Johan Corveleyn
Op 23 dec. 2017 20:08 schreef "Anton Shepelev" : Stefan Sperling: > Which version of svn are you using to run this > merge? 1.8.17 (r1770682) as part of CollabNet SVN. This issue seems similar: https://issues.apache.org/jira/plugins/servlet/mobile#issue/SVN-4582 I found this in the list

Re: Problem with merge --reintegrate

2017-12-23 Thread Daniel Shahaf
Anton Shepelev wrote on Sat, 23 Dec 2017 22:08 +0300: > Shall I forward my replies to your e-mail, as you do > yours? This is a "CC the poster by default" list --- we don't require people to subscribe --- but Stefan set the Mail-Followup- To header in a way that indicates he prefers not to be CC'd

Re: Problem with merge --reintegrate

2017-12-23 Thread Mark Phippard
> On Dec 23, 2017, at 2:08 PM, Anton Shepelev wrote: > > Stefan Sperling: > >> Which version of svn are you using to run this >> merge? > > 1.8.17 (r1770682) as part of CollabNet SVN. I am > not at all certain we need its extra features, but > someone else has decided to use that. >

Re: Problem with merge --reintegrate

2017-12-23 Thread Anton Shepelev
Stefan Sperling: > Which version of svn are you using to run this > merge? 1.8.17 (r1770682) as part of CollabNet SVN. I am not at all certain we need its extra features, but someone else has decided to use that. Shall I forward my replies to your e-mail, as you do yours? -- Please,

Re: Problem with merge --reintegrate

2017-12-23 Thread Stefan Sperling
On Sat, Dec 23, 2017 at 06:29:34PM +0300, Anton Shepelev wrote: > I wrote: > > > I am having trouble reintegrating my fresh and > > short-lived test branch (called progbar). Al- > > though there have been no changes to the trunk > > since the creation of the branch from revision >

Re: 回复： why my process open .svn/tmp/svn-XXXXXX file? and why aretmpfiles deleted? and why my process can't open the right file after tmpfiles deleted?

2017-12-23 Thread Johan Corveleyn
Op 23 dec. 2017 04:19 schreef "Keva-Slient" <356730...@qq.com>: thank you for your patience. my English is very poor. No problem, we'll try to communicate as best as we can :-). But please use "reply all" to keep the users-list in cc, so others can help out as well ... 1 It's still not clear

Re: Problem with merge --reintegrate

2017-12-23 Thread Anton Shepelev
I wrote: > I am having trouble reintegrating my fresh and > short-lived test branch (called progbar). Al- > though there have been no changes to the trunk > since the creation of the branch from revision > 2324, > >svn merge "^/branches/progbar" --reintegrate > > gives: > >

Re: Problem with merge --reintegrate

2017-12-23 Thread Anton Shepelev
I wrote: > I am having trouble reintegrating my fresh and > short-lived test branch (called progbar). Al- > though there have been no changes to the trunk > since the creation of the branch from revision > 2324, > >svn merge "^/branches/progbar" --reintegrate > > gives: > >

Re: Problem with merge --reintegrate

2017-12-23 Thread Anton Shepelev
I wrote: > I am having trouble reintegrating my fresh and > short-lived test branch (called progbar). Al- > though there have been no changes to the trunk > since the creation of the branch from revision > 2324, > >svn merge "^/branches/progbar" --reintegrate > > gives: > >

Problem with merge --reintegrate

2017-12-23 Thread Anton Shepelev
Hello, all I am having trouble reintegrating my fresh and short-lived test branch (called progbar). Although there have been no changes to the trunk since the creation of the branch from revision 2524, svn merge "^/branches/progbar" --reintegrate gives: svn: E195012: Unable to