I used a recent-ish trunk build.
Daniel Shahaf wrote on Thu, Jun 23, 2011 at 03:03:05 +0300:
> I also expected step 4 to conflict, and I also don't get a conflict:
>
> [[[
> 9,% ./new.sh
> ### Making a Greek Tree for import...
> ### Done.
>
> ### Importing it...
>
> Committed revision 1.
> ###
I also expected step 4 to conflict, and I also don't get a conflict:
[[[
9,% ./new.sh
### Making a Greek Tree for import...
### Done.
### Importing it...
Committed revision 1.
### Done.
9,% cd wc1/trunk/
9,% $svn cp -q A A2
9,% $svn ci -q -m branch
9,% :>A/mu
9,% $svn ci -q -mrm A
9,% $svn up
Hi,
we have the following situation:
1. A branch is created from trunk.
2. In trunk a line of code is added and commited as revision X
3. The line is removed again and commited as revision X+1
4. In branch changeset X+1 is merged from trunk
5. In branch changeset X is merged from trunk.
The pro
