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

Re: [TSVN] Merge only cooperated going the wron way

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-01-07 18:30:17 CET

Peter McNab wrote:
[snip]
> The "from" URL is then set to http://192.168.1.20/svn/MyProject/Branch
> The "To" checkbox 'Use "From:" URL is uncheckd.
> Just why I would want to use the From URL as the destination I don't
> quite fathom.
> The "To" URL is set to http://192.168.1.20/svn/MyProject/Trunk

Using the "from" and "to" URL is different than you think, that's why
you don't get the desired results.
Even though it's explained in the docs (TSVN and the Subversion book)
I'll try to explain:

You want to merge in the changes from your branch. But which changes?
The changes from revision 400 to 800? Or just the revision 700 to 800?
If you do that, you have to check the "Use 'From:' URL" and enter the
revisions accordingly.
Some people don't like the idea of remembering the revisions or check
the log to find the required revisions. To avoid that, they create
branch-tags. For example, you create a branch and start working there.
Then you merge in the changes you've made on the branch, but you want to
work further on that branch. After you merged your first changes, you
create another branch from it. Then, the next merge will be
from: http://192.168.1.20/svn/MyProject/BranchMark1 (HEAD)
To: http://192.168.1.20/svn/MyProject/Branch (HEAD)

Then after the merge, you create another branch
http://192.168.1.20/svn/MyProject/Branch ->
http://192.168.1.20/svn/MyProject/BranchMark2

and so on.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jan 7 18:30:53 2005

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