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

Re: [TSVN] TSVN Merge issue vs. "Feature Branches" in SVN book

From: SteveKing <stefankueng_at_gmail.com>
Date: 2005-01-13 08:52:55 CET

On Wed, 12 Jan 2005 17:47:33 -0600, Dave Peterson
<dpeterson@enthought.com> wrote:

> To the FAQ maintainers: let me apologize in advance for mistakenly
> putting a question in the queue that is probably better handled in the

We can delete that entry, no problem.

> Here's what I am doing at a command line -- URL1 is my trunk, URL2 is my
> feature branch, and WC is a local copy of URL1.

So you have
/trunk
/branches/features

> c:\projects\WC>svn merge --dry-run URL2@HEAD URL1@HEAD .
> And I get a list of changes that matches what I expect for the commited
> feature work done to URL2 - 10 changes listed.

You shouldn't just 'count' the changes. Check the changes it lists carefully.

> Here's what I am doing in TSVN -- again URL1 is my trunk, URL2 is my
> feature branch, and WC is a local copy of URL1.
> - right click on the WC folder and select the "Merge..." TSVN menu item
> - edit the "From" URL to be URL2 and select the "Head Revision"
> radio button
> - unselect the "Use "From:" URL" checkbox, set the "To" URL to be
> URL1, and select the "Head Revision" radio button
> - check the "Dry Run" checkbox
> - click "OK"
> And I get a much larger list of changes than I expected -- 2248 changes
> listed. TSVN is definitely including changes to URL1 that have already
> been merged and committed into URL2 -- changes the command line version
> is not listing.

Check the listings: TSVN also lists all directories that might get
affected, while the command line client suppresses those in the
listing.

> Is this a bug or am I doing something TSVN is not designed to support?

I just tried the merge myself. And it worked as I would expect it to.
Can you give us a reproduction recipe? That means something like
modify /trunk/fil11
create branch /branches/features/ from /trunk
modify /trunk/file1
comit
...

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 Thu Jan 13 08:53:30 2005

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