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

merging a branch to the trunk

From: Craig White <craigwhite_at_azapple.com>
Date: 2006-03-21 16:47:32 CET

Let me try to describe what I am trying to do in another way.

I want to merge my branch 'phase2' into my main trunk

I change directories to my main trunk
$ pwd
/home/craig/svn/th-db/trunk

svn merge --dry-run -r 1:20 svn \
+craigssh://craig@srv1.example.com/home/craig/svn/th-db/branches/phase2

but it 'appears' to me that it is creating everything new inside my
trunk...

Skipped 'test'
Skipped 'test/unit'
A test/unit/client_test.rb
A test/unit/user_test.rb
A test/unit/notifier_test.rb
A test/unit/clients_test.rb
A test/unit/error_mailer_test.rb
A test/unit/facility_test.rb
A test/unit/case_manager_test.rb
A test/unit/referral_note_test.rb
A test/unit/case_managers_test.rb
A test/unit/placement_test.rb
A test/test_helper.rb

when all these files already exist in the 'trunk'

$ ls -l test
total 40
drwxr-xr-x 3 craig dom_users 4096 Mar 21 08:41 fixtures
drwxr-xr-x 3 craig dom_users 4096 Mar 21 08:41 functional
drwxr-xr-x 5 craig dom_users 4096 Mar 10 23:32 mocks
-rw-r--r-- 1 craig dom_users 1317 Mar 10 23:32 test_helper.rb
drwxr-xr-x 3 craig dom_users 4096 Mar 21 08:41 unit

$ ls -l test/unit/
total 64
-rw-r--r-- 1 craig dom_users 246 Mar 10 23:32 case_managers_test.rb
-rw-r--r-- 1 craig dom_users 244 Mar 10 23:32 case_manager_test.rb
-rw-r--r-- 1 craig dom_users 224 Mar 10 23:32 clients_test.rb
-rw-r--r-- 1 craig dom_users 222 Mar 10 23:32 client_test.rb
-rw-r--r-- 1 craig dom_users 232 Mar 10 23:32 facility_test.rb
-rw-r--r-- 1 craig dom_users 234 Mar 10 23:32 placement_test.rb
-rw-r--r-- 1 craig dom_users 248 Mar 10 23:32 referral_note_test.rb
-rw-r--r-- 1 craig dom_users 214 Mar 10 23:32 user_test.rb

what is the way to do this?

Craig

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Mar 21 16:59:16 2006

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