On Jun 23, 2005, at 1:56 PM, kfogel@collab.net wrote:
> Stephen Davis <subversion@soundgeek.org> writes:
>
>
>> I created the branch in r54 and committed one file on the branch to
>> bring me to r55.
>>
>>
>
> "committed one file on the branch" could mean you created a new file,
> or that you copied it from elsewhere in the repository using svn cp.
> The difference is crucial here, so an exact transcript would be best.
>
Sorry, I copied my trunk wc directly to a new branch URL.
svn cp . file:///path/to/repo/branches/broken
Here's a full example:
[SoundGeek ~]$ cd /tmp/
[SoundGeek /tmp]$ svnadmin create /tmp/pegtest
[SoundGeek /tmp]$ svn mkdir file:///tmp/pegtest/trunk -m 'add basic
directories'
[SoundGeek /tmp]$ svn mkdir file:///tmp/pegtest/tags -m 'add basic
directories'
[SoundGeek /tmp]$ svn mkdir file:///tmp/pegtest/branches -m 'add
basic directories'
[SoundGeek /tmp]$ svn co file:///tmp/pegtest wc
A wc/trunk
A wc/branches
A wc/tags
Checked out revision 3.
[SoundGeek /tmp]$ cd wc/trunk/
[SoundGeek /tmp/wc/trunk]$ vi HelloWorld.c
[SoundGeek /tmp/wc/trunk]$ svn add HelloWorld.c
A HelloWorld.c
[SoundGeek /tmp/wc/trunk]$ svn ci HelloWorld.c -m 'add HelloWorld.c'
Adding HelloWorld.c
Transmitting file data .
Committed revision 4.
[SoundGeek /tmp/wc/trunk]$ svn cp . file:///tmp/pegtest/branches/
broken -m 'copy trunk to branch'
Committed revision 5.
[SoundGeek /tmp/wc/trunk]$ cd ../..
[SoundGeek /tmp]$ svn co file:///tmp/pegtest/branches/broken
A broken/HelloWorld.c
Checked out revision 5.
[SoundGeek /tmp]$ cd broken/
[SoundGeek /tmp/broken]$ svn cat -r 4 HelloWorld.c@4
svn: File not found: revision 4, path '/branches/broken/HelloWorld.c'
[SoundGeek /tmp/broken]$ svn log -r 4 HelloWorld.c
svn: File not found: revision 4, path '/branches/broken/HelloWorld.c'
>> ========================================================
>> [SoundGeek ~/Development/Test/Work/ProjA]$ svn cat -r 32
>> HelloWorld.c@32
>> svn: File not found: revision 32, path '/branches/test/ProjA/
>> HelloWorld.c'
>>
>
> Expected failure, due to peg revision, yup.
>
Which is why the svn_client_cat() compatibility wrapper fails.
stephen
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 24 02:34:51 2005