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

Re: [PATCH] Issue 838 merge should copy-with-history

From: Branko Čibej <brane_at_xbc.nu>
Date: 2002-08-09 00:12:51 CEST

Philip Martin wrote:

>Karl Fogel <kfogel@newton.ch.collab.net> writes:
>>Philip Martin <philip@codematters.co.uk> writes:
>>>The feedback bug is that children in copied directories show up as
>>>copied-with-history but status '_' not status 'A', is that correct?
>>>This is the same behaviour as 'svn cp' is it a problem there as well?
>>No, it's that there are too many spaces between the left-side code
>>letters and the path. Branko gives an example of this in the issue:
>> A A/C/Q
>> A A/C/Q/bar
>> A A/C/foo
>But that's like 'svn cp' as well, so it's hardly an argument to revert
>it. Consistency is good!
>$ svn cp http://localhost:8888/repositories/current-repo/A/B/E working_copies/basic_tests-1/A/C
>A working_copies/basic_tests-1/A/C/E/beta
>A working_copies/basic_tests-1/A/C/E/alpha
>Checked out revision 1.
>A working_copies/basic_tests-1/A/C/E

Funny, I'm not seeing this in with ra_local. I've attached the script
I've been using, and only the merge has strange output (btw, tsvn and
tadm are aliases for my in-tree svn and svnadmin, respectively).

I also noticed I can't easily conditionalize the outpu from
repos_diff.c:add_directory. Will have to think up something else instead.

Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/


pushd .
rm -fr re wc

tadm create re
tsvn co file:///s:/re wc
cd wc
echo "------- add A A/foo"
tsvn mkdir A
touch A/foo
tsvn add A/foo
echo "------- commit"
tsvn ci -m ''
echo "=========================== Revision 1"
echo "------- cp (url)A B"
tsvn cp file:///s:/re/A B
echo "------- status"
tsvn st -uv
echo "------- commit"
tsvn ci -m ''
echo "=========================== Revision 2"
cd B
echo "------- add B/Q B/Q/bar"
tsvn mkdir Q
touch Q/bar
tsvn add Q/bar
echo "------- commit"
tsvn ci -m ''
echo "=========================== Revision 3"
cd ..
echo "------- merge (url)B A"
tsvn merge -r2:3 file:///s:/re/B A
echo "------- status"
tsvn st -uv
echo "------- commit"
tsvn ci -m ''
echo "=========================== Revision 4"
echo "------- copy (url)/ to C"
tsvn cp file:///s:/re C
echo "------- status"
tsvn st -uv C


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 9 00:13:26 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.