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

Merging from trunk to branch after merges into trunk from different branch

From: Todd Nine <todd.nine_at_gmail.com>
Date: Sun, 11 Jan 2009 20:14:43 -0800 (PST)

Hi all,
  I'm having a very hard time with some branch management. I have
trunk, which is the main code base for continuing development. I've
created 2 branches from trunk. See below for a description of the
branches.

trunk
|
+->branch/encryption (Revision 284)
| Several changes made
|
+->branch/tracks-query-fix (Revision 295) Fix for production bug
| Several changes made
|
+ Revision(299) Merged tracks-query-fix back into trunk.

Now at this point trunk contains changes from both new development, as
well as the fixes for our production bug. I would like to merge the
changes from trunk (which now contains the tracks-query-fix changes)
into my branch "encryption". Whenever I try the following settings in
the merge dialogue, the code from trunk is brought over, but it is not
correctly merged, it simply overwrites any changes I've made in the
encryption branch. I use the following settings.

1. Perform a fresh checkout of the branch/encryption code onto my
drive into directory "merge". I'm at revision 300
2. Right click on "merge" and select the tortoise svn merge option
3. Merge two different trees. (Server is a 1.4.3 server)
4. In the From url I select branches/encryption head revision
5. In the To url I select trunk head revision

My merge runs, and I get updated files, but all my changes are
blasted. Is there a setting I need to change? I tried ignore
ancestry, but it didn't help. I have the latest release as of
yesterday.

Thanks,
Todd

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1018174

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-12 07:10:44 CET

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