[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Bug if merging a replaced file

From: Stefan Völkel <stefan.voelkel_at_millenux.com>
Date: 2005-09-21 09:06:52 CEST

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

confirmed with:

I used this script:

- ---------------- snip ---------------------
#!/bin/bash

BASE=/tmp/svn
URL=file://$BASE/rep

rm -rf $BASE/{A,B,rep}

svnadmin create rep
svn mkdir -m "" $URL/A/
mkdir A
svn co $URL/A/ A
echo "XXX" > A/test
# echo "This is A" > A/test
svn add A/test
svn commit -m "" A
svn copy -m "" $URL/A/ $URL/B/
mkdir B
svn co $URL/B/ B
svn delete B/test
# svn ci -m "" B
echo "XXX" > B/test
# echo "This is B" > B/test
svn add B/test
svn commit -m "" B
svn merge -r 4:5 $URL/B/ A
svn update A
- ---------------- snip ---------------------

Now if I uncomment the 'svn ci -m "" B' after deleting B/test 'svn
update A' gives no error.

But if I uncomment 'This is A' and 'This is B' svn displays:

        Committed revision 5.
        A A/test
        At revision 5.

but I do have a conflict (which is what I would have expected):

        $ ls -1 A/
        test
        test.merge-left.r0
        test.merge-right.r5
        test.working

        $ svn status A
        ? A/test.merge-left.r0
        ? A/test.merge-right.r5
        ? A/test.working
        C A/test

regards
        Stefan
- --
Stefan Völkel stefan.voelkel@millenux.com
Millenux GmbH mobile: +49.170.79177.17
Lilienthalstraße 2 phone: +49.711.88770.300
70825 Stuttgart-Korntal fax: +49.711.88770.349
     -= linux without limits -=- http://linux.zSeries.org/ =-
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDMQaMtWF28C4HGsQRAoKVAJ9J3gGBtyYLJTz7T6kX1jO7sP8k9ACcDd1d
zhBC4alUtssboZno1R1J2Lc=
=piRD
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 21 09:08:59 2005

This is an archived mail posted to the Subversion Users mailing list.