--dry-run seems to fail with a merging command

2014-02-11 Thread Vesa Paatero
Hi everyone. When I ran >svn merge --dry-run --allow-mixed-revisions --depth empty "^/app/trunk//scripts_deprecated_tests_etc" scripts_deprecated_tests_etc I got no output. However, when I ran >svn merge --allow-mixed-revisions --depth empty "^/app/trunk/uuu

RE: How about a troubleshooting guide for tree conflicts?

2013-08-30 Thread Vesa Paatero
From: Stefan Sperling [s...@elego.de] Sent: Friday, August 30, 2013 4:08 PM To: Vesa Paatero Cc: users@subversion.apache.org Subject: Re: How about a troubleshooting guide for tree conflicts? On Fri, Aug 30, 2013 at 12:49:54PM +, Vesa Paatero wrote: > Hi, > > I've

How about a troubleshooting guide for tree conflicts?

2013-08-30 Thread Vesa Paatero
Hi, I've noticed that tree conflicts are a nasty thing that occur now and then but can take half a day to clear out. The tree conflict problem (or field of problems) runs contrary to SVN's attempt to be the intuitive and quirk-free alternative to SVN. In the past, when each directory of t

RE: Branching with externals

2011-08-29 Thread Vesa Paatero
> > I tried to use branching and switching in a project including external > > files and directories but the behavior turned out buggy/problematic > How so? I got tree conflict errors whose cause were traceable to the externals. Seemingly, SVN tried to put the externals to the branch and failed

Branching with externals

2011-08-29 Thread Vesa Paatero
Hi, I tried to use branching and switching in a project including external files and directories but the behavior turned out buggy/problematic in such a way that I'm wondering if I can use branches in a project with externals at all. However, I didn't see any related issues in the bug tracker.