Re: Need to restructure repo folders: Problem: SVN COPY is recursive

2013-03-15 Thread Sven Uhlig
Am 15.03.2013 21:30, schrieb tim.willi...@ucb.com: > Yes, it appears I am headed toward a wrapper script to copy one file at a > time. I wanted to make sure I was not missing something in SVN that would > make it easier (a non-recursive copy, or something in svnmucc where I could > copy a bunch

Re: unexpected tree conflict on merge for same source file

2012-10-21 Thread Sven Uhlig
Am 18.10.2012 15:06, schrieb Stefan Sperling: > On Thu, Oct 18, 2012 at 02:10:25PM +0200, Sven Uhlig wrote: >> Am 17.10.2012 19:12, schrieb Stefan Sperling: >> At the time when the branches were created there was no use of shared >> code. Later some functions seem to be unexpe

Re: unexpected tree conflict on merge for same source file

2012-10-18 Thread Sven Uhlig
Am 17.10.2012 19:12, schrieb Stefan Sperling: > On Wed, Oct 17, 2012 at 05:30:14PM +0200, Sven Uhlig wrote: >> There could be >> changes that are commited to prj1 that are requried in prj2 because of >> e.g. some shared code. >> >> I would do this with the followi

Re: unexpected tree conflict on merge for same source file

2012-10-17 Thread Sven Uhlig
Am 16.10.2012 18:02, schrieb Stefan Sperling: > On Tue, Oct 16, 2012 at 01:17:40PM +0200, Sven Uhlig wrote: >> Below is a .bat file for creating the repo with some more conflicts that >> we do not understand. I would be happy if someone could explain these as >> well. >

Re: unexpected tree conflict on merge for same source file

2012-10-17 Thread Sven Uhlig
Am 17.10.2012 12:00, schrieb Stefan Sperling: > On Tue, Oct 16, 2012 at 06:35:21PM +0200, Stefan Sperling wrote: >> Again, sticking to simple branching/merging patterns where all merges >> happen between directly related branches makes things a lot easier. > > Hi again Sven, > > I've looked at th

unexpected tree conflict on merge for same source file

2012-10-16 Thread Sven Uhlig
Hello, imagine the following repository structure: /branches/prj1/first.txt /branches/prj1/second.txt /branches/prj2/first.txt /branches/testing/first.txt /branches/testing/second.txt /trunk/first.txt All first.txt in /branches/* are from the same /trunk/first.txt The file was only changed in /t