kfogel@collab.net wrote:
> Peter Hercek <peter@syncad.com> writes:
>
>>I did run this:
>>svn co svn://svn/trunk/lib/ACE_wrappers
>>cd ACE_wrappers
>>gdb `where svn`
>>(gdb) r merge svn://svn/tags/lib/ACE_wrappers/ACE_5_3_1_and_TAO_1_3_1
>>svn://svn/tags/lib/ACE_wrappers/current
>
>
> Thank you.
>
> Can you tell me in words what you're trying to accomplish with this
> command? (My question may be unrelated to the potential bug you've
> found, I'm not sure yet.)
Sorry, I removed the prompts from the shell commands but I did not
remove it from the debugger. (gdb) is just the debugger prompt.
... and with the r (run) command I run the svn executable under
debugger so that the abort signal is caught by debugger and the
stack can be shown.
If it would not be run under debugger it would be like:
svn co svn://svn/trunk/lib/ACE_wrappers
cd ACE_wrappers
svn merge svn://svn/tags/lib/ACE_wrappers/ACE_5_3_1_and_TAO_1_3_1
svn://svn/tags/lib/ACE_wrappers/current
In svn://svn/trunk/lib/ACE_wrappers, we have our development version
of ACE_wrappers (it is a branch of the vendor ACE/TAO library).
In svn://svn/tags/lib/ACE_wrappers/ACE_5_3_1_and_TAO_1_3_1, we have
the ACE/TAO library as released by vendor (ACE version 5.3.1 and
TAO version 1.3.1).
svn://svn/tags/lib/ACE_wrappers/current was originally the same as
svn://svn/tags/lib/ACE_wrappers/ACE_5_3_1_and_TAO_1_3_1. Using
svn_load_dirs.pl I moved it to ACE version 5.4.5 and TAO version
1.4.5 as they were released by vendor.* With the svn merge command
I wanted to merge the vendor changes to our version in trunk.
In our development trunk we have two subdirectories lib (for 3rd
party stuff and src for our own projects). That is the reason for
the "lib" segment between "trunk" and "ACE_wrappers". ACE_wrappers
is the default name for ACE/TAO library in the vendor distribution.
Peter.
*BTW The support for renaming in svn_load_dirs is not very
usefull for larger projects. It originally proposed about 22000
files for addition and deletion. Nobody is going to pair such
bug amount of files. I did not do it too. Some heuristic would
be handy there.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 20 23:42:26 2005