Re: Could merging be any more cumbersome?

On Aug 5, 2005, at 5:53 AM, Ben Collins-Sussman wrote:

>> I see that test was added in r11586, so:
>>
>>
>
> You do? Where do you see that? Running 'svn log -v' would
> actually show you the list of changed paths in each revision. I
> think r11586 doesn't add test/, but rather adds test/config/.
> That's why you only see test/config/ being added.

Sure looks to me like test/ was added in r11586, and test/config/ in
r11587:

$ svn log -v test
------------------------------------------------------------------------
r11587 | rmann | 2005-08-04 18:06:44 -0700 (Thu, 04 Aug 2005) | 2 lines
Changed paths:
    A /branches/relaunch/db/test/config
    A /branches/relaunch/db/test/config/log4j.xml
    A /branches/relaunch/db/test/config/test-config.xml

A bit of trouble with svn.

------------------------------------------------------------------------
r11586 | rmann | 2005-08-04 18:05:02 -0700 (Thu, 04 Aug 2005) | 2 lines
Changed paths:
    A /branches/relaunch/db/test
    A /branches/relaunch/db/test/src
    A /branches/relaunch/db/test/src/java
    A /branches/relaunch/db/test/src/java/foocompany
    A /branches/relaunch/db/test/src/java/foocompany/AbstractTest.java
    A /branches/relaunch/db/test/src/java/foocompany/db
    A /branches/relaunch/db/test/src/java/foocompany/db/TestInsert.java

Added unit testing.

------------------------------------------------------------------------

Still, even trying to merge using r11251 (see the original email),
svn complained about not knowing anything about test/, which makes
things difficult.

>> I say: it is the RIGHT way to think about it. svn merge should be
>> as easy to use as:
>>
>> $ cd Source
>> $ ls
>> relaunch/ trunk/
>> $ svn merge relaunch/db trunk/db
>>
>
> Congrats, you've just described merge-tracking. You're preaching
> to the choir. :-)

Ah! Good to know I'm not at odds with the choir, the way I usually am.

-- 
Rick
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org