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

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

From: Josha Foust <jfoust_at_mankowindows.com>
Date: 2005-01-14 00:13:12 CET

> --------------
> SHORT SUMMARY:
> --------------
> In short, it works. When promoting from the feature branch to the trunk I
> just
> needed to swap my "From" and "To" urls so that "From" was the trunk and
> "To" was
> the feature branch. The target path is always the local working copy of
> the trunk. This was necessary no matter whether I was using TSVN or SVN.

I think the important point is that you aren't really merging from one tree
to another; you are generating a diff between two trees and applying it to a
third. I think your suggested layout is good because it indicates creating
a diff and applying it.

Josha Foust

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jan 14 00:13:53 2005

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