Re: Tree conflict problem when merging two branches

Thanks Brane, Has a bug report been filed or should I try to file one? André On Sat, Aug 13, 2016 at 5:07 AM, Branko Čibej wrote: > On 13.08.2016 00:20, Ryan Schmidt wrote: > >> On Aug 12, 2016, at 3:00 PM, André Roy wrote: > >> > >> Hi all, > >> > >>

Re: Tree conflict problem when merging two branches

On 13.08.2016 00:20, Ryan Schmidt wrote: >> On Aug 12, 2016, at 3:00 PM, André Roy wrote: >> >> Hi all, >> >> First time posting. >> >> -Create a repository (trunk/tags/branches), >> -Checkout /trunk, >> -Create branch1 in /branches/branch1, and checkout. >> -Create and

Re: Tree conflict problem when merging two branches

Hi Ryan, I'm interfacing using TortoiseSVN, so I cannot really provide a transcript. Those are however the exact sequence of events that will reproduce the conflicts. André On Fri, Aug 12, 2016 at 3:20 PM, Ryan Schmidt < subversion-2...@ryandesign.com> wrote: > > > On Aug 12, 2016, at 3:00

Re: Tree conflict problem when merging two branches

> On Aug 12, 2016, at 3:00 PM, André Roy wrote: > > Hi all, > > First time posting. > > -Create a repository (trunk/tags/branches), > -Checkout /trunk, > -Create branch1 in /branches/branch1, and checkout. > -Create and checkout branch2. > -Create file.txt in Trunk +

Tree conflict problem when merging two branches

Hi all, First time posting. -Create a repository (trunk/tags/branches), -Checkout /trunk, -Create branch1 in /branches/branch1, and checkout. -Create and checkout branch2. -Create file.txt in Trunk + add + commit. -Merge trunk changes into branch1 and commit. -Merge trunk changes into branch2

Re: Problem with merging

On Thu, Sep 13, 2012 at 09:23:54AM -0400, John Maher wrote: How hard is it to change the book? Check out the book sources, make changes, and either send a patch (i.e. the output of svn diff showing your changes) to the svnbook development list, or file an issue in the book's issue tracker and

RE: Problem with merging

Thank you Stefan. Very helpful. John -Original Message- From: Stefan Sperling [mailto:s...@elego.de] Sent: Friday, September 14, 2012 10:24 AM To: John Maher Cc: users@subversion.apache.org Subject: Re: Problem with merging On Thu, Sep 13, 2012 at 09:23:54AM -0400, John Maher wrote

Re: Problem with merging

John Maher wrote on Thu, Sep 13, 2012 at 10:26:39 -0400: Yes that is what I did. Now that I know that causes problems with the subversion mailing list I won't do it again. For completeness... http://subversion.apache.org/docs/community-guide/mailing-lists#fresh-post

Re: Problem with merging

On 12/09/12 18:39, John Maher wrote: Hello [CUT] Can you please stop reusing an already existing thread and instead start a new one for a new question? Thanks John Thanks Giulio

RE: Problem with merging

Thanks Stefan. I did read most of the links. I didn't know about the FAQ, thanks. Your statement was key: Note that the tree being talked about there is not an individual branch, but all nodes in the repository, including the /trunk directory and the /branches/feature directory. Basically in

RE: Problem with merging

@subversion.apache.org Subject: Re: Problem with merging Guten Tag John Maher, am Mittwoch, 12. September 2012 um 19:39 schrieben Sie: I started using subversion a while back and doing a merge I lost a bunch of source code which prohibited me from updating production for weeks. Unless you didn't commit, you

Re: Problem with merging

Guten Tag John Maher, am Donnerstag, 13. September 2012 um 15:35 schrieben Sie: In reality we should've had code control a long time ago. I only got here a few years ago. And when I first got here I met extreme resistance about incorporating something like subversion. I finally got the

RE: Problem with merging

: Thursday, September 13, 2012 4:56 AM To: John Maher Cc: users@subversion.apache.org Subject: Re: Problem with merging On 12/09/12 18:39, John Maher wrote: Hello [CUT] Can you please stop reusing an already existing thread and instead start a new one for a new question? Thanks John Thanks Giulio

RE: Problem with merging

@subversion.apache.org Subject: Re: Problem with merging On 13/09/12 15:15, John Maher wrote: Can you tell me what that means? I had a question on merging so I sent it to the mailing list. Are you saying I'm not supposed to do that? If not then can you explain the procedure? You are hijacking someone

Re: Problem with merging

On 13/09/12 15:26, John Maher wrote: Yes that is what I did. Now that I know that causes problems with the subversion mailing list I won't do it again. John Thank you Giulio

Re: Problem with merging

Guten Tag John Maher, am Donnerstag, 13. September 2012 um 16:26 schrieben Sie: Yes that is what I did. Now that I know that causes problems with the subversion mailing list I won't do it again. It causes problems on nearly every mailing list as they each work similar. The first mail you sent

Re: Problem with merging

On Sep 13, 2012, at 08:23, John Maher wrote: How hard is it to change the book? I know what it means now, but the next person may get confused. I would bet that someone will eventually get confused. If it said repository tree like the FAQ I would bet it helps. Book feedback should be

Problem with merging

Hello I started using subversion a while back and doing a merge I lost a bunch of source code which prohibited me from updating production for weeks. I now have a stable code base and wish to use subversion so I tried to follow chapter 4, branching and merging. It failed. I was hoping someone

Re: Problem with merging

On Wed, Sep 12, 2012 at 01:39:41PM -0400, John Maher wrote: Here's what I did: Hi John, your questions are about fundamental Subversion concepts, and that's fine. Just please understand that I don't want to type another explanation since good documentation has already been written. So, below,

Re: Problem with merging

Guten Tag John Maher, am Mittwoch, 12. September 2012 um 19:39 schrieben Sie: I started using subversion a while back and doing a merge I lost a bunch of source code which prohibited me from updating production for weeks. Unless you didn't commit, you can't loose source code, that's what

Problem with merging

Hi Folks, i want to merge a branch into trunk. For that i got the first revision of the branch with (svn log --stop-on-copy = 2854). Now i want to merge with svn merge -r 2854:3143 ^/branches/mybranch . in a trunk working dir. Svn now tries to merge the trunk not with the newest files in the

Re: Problem with merging

On Fri, Jan 14, 2011 at 02:12:56PM +0100, peter.schwei...@gmail.com wrote: Hi Folks, i want to merge a branch into trunk. For that i got the first revision of the branch with (svn log --stop-on-copy = 2854). Now i want to merge with svn merge -r 2854:3143 ^/branches/mybranch . in a trunk

Re: Problem with merging

Thx very much, that solved my problem :-) Strangely, until now i was able to merge branches into trunk without this option Regards, Peter On Fri, Jan 14, 2011 at 2:42 PM, Stefan Sperling s...@elego.de wrote: On Fri, Jan 14, 2011 at 02:12:56PM +0100, peter.schwei...@gmail.com wrote: Hi

Re: Problem with merging

On Fri, Jan 14, 2011 at 02:53:11PM +0100, peter.schwei...@gmail.com wrote: Thx very much, that solved my problem :-) Strangely, until now i was able to merge branches into trunk without this option You got lucky. The --reintegrate option is quite important. See