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

Jens Scheidtmann wrote:
>> from trunk@HEAD (which is e.g. revision 200) to feature_branch@HEAD?
>> Shouldn't that be the other way around (the lower revision first)?
> But as the feature branch@HEAD contains the changes local to it
> *PLUS* the changes on trunk since the branch was made,
>
> From: TRUNK @ HEAD <-
> To : FEATURE_BRANCH @ HEAD <- Note same revision
>

This is what I find confusing. It looks to me as if

merge from trunk@HEAD to feature_branch@HEAD into trunk WC is
effectively setting trunk = feature_branch, so (assuming no local
changes in WC) the WC now exactly reflects feature_branch@HEAD and
discards any changes made to trunk since feature_branch was copied off.
The net effect is to copy a different revision/tree from the repo over
the top of the existing WC.

Uses for this that I can see are:

Took a branch too early, and now want to update it to reflect trunk@HEAD
before starting work on it - but why not just delete the old one and
make a new one.

Trunk is Version 1, which is used only for bug fixes, and Version 2 is
developed in a branch. At some point, trunk has to be updated to match
the v2 branch. But this is backwards from normal usage, which keeps new
V2 developments in the trunk and makes a branch at V1 for bug fixes.

To me these look like very uncommon use cases, so it should not be easy
to do that accidentally. I don't think we can get rid of having separate
From/To URLs altogether, but I think we should make it invisible by
default to avoid confusion.

Simon

-- 
       ___
  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