I've tried to merge some project files but ended up with: [cid:image002.png@01CBBC80.27E388D0]
Pressing Keep the directory resulted in:
[cid:image001.png@01CBBC80.27E388D0]
[cid:image002.png@01CBBC80.27E388D0]
<Root-project checked in>
<Ciceron-project checked out from trunk>
Merging from a branch with name "xxx" but with a subfolder "Ciceron" to the
Root-project directory resulted in this.
Windows XP SP2
TortoiseSVN 1.6.7, Build 18415 - 32 Bit , 2010/01/22 17:55:06
Subversion 1.6.9,
apr 1.3.8
apr-utils 1.3.9
neon 0.29.3
OpenSSL 0.9.8k 25 Mar 2009
zlib 1.2.3
________________________________
Joel Wahlberg
Senior Systems Engineer, Visma Sirius
Switchboard : +46 910 58 66 00 - Direct : +46 910 58 66 36 - Mobile : +46 70
551 94 86
________________________________
<<inline: image001.png>>
<<inline: image002.png>>
