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

RE: Merging a second-order branch

From: Simon McClenahan <smcclenahan_at_healthcompartners.com>
Date: 2004-04-27 00:27:58 CEST

I did the merge as described from the command-line. I'm going to assume for now that TortoiseSVN doesn't support this type of merge operation. A couple more questions:

- I was surprised to see some files were skipped. Was this because of a configuration somewhere, or because svn merge decided? Something to do with dot-files?
Skipped '.classpath'
Skipped '.project'

- In the trunk, there was a "bin" directory under version control, which I svn deleted in my branch. Shouldn't the merge have deleted the directory, or at least the hidden .svn dir? I have another branch where I am doing some major re-organizing of directories and file moving. Should I be anticipating problems like this when I merge back to the trunk?

>svn --version
svn, version 1.0.0
   compiled Feb 25 2004, 18:32:49

- Simon

-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]
Sent: Monday, April 26, 2004 4:11 PM
To: Simon McClenahan
Cc: Subversion Users (E-mail)
Subject: Re: Merging a second-order branch

In the commandline client world, you would simply cd into your trunk
working copy, and run

   svn merge privatebranchURL@81 taskbranchURL@HEAD

Remember that merge compares two trees, and applies the diff to your
working copy. In your situation, these are the two trees to compare.

NOTE: This message and any included attachments are from HealthCom Partners, LLC and are intended only for the addressee(s). The information contained herein may include trade secrets or privileged or otherwise confidential information. Unauthorized review, forwarding, printing, copying, distributing, or using such information is strictly prohibited and may be unlawful. If you received this message in error, or have reason to believe you are not authorized to receive it, please promptly delete this message and notify the sender by e-mail.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 27 00:28:28 2004

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

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