Jens Scheidtmann wrote:
>> 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.
>
> No, you repetively merged changes on trunk into the feature
> branch. ie. you did:
>
> - WC = feature branch
> - Merge
> FROM: Trunk @ BRANCH_REVISION
> TO : Trunk @ HEAD
And you didn't read what I wrote ;-)
svn merge trunk@HEAD feature_branch@HEAD trunk_wc
(ignore my dodgy syntax)
- WC = trunk
- Merge
From: Trunk @ HEAD
To : feature_branch @ HEAD
This example (or one close to it) is given in the SVN book; it then goes
on to say that it will probably not do what you want it to, but it then
doesn't give an example of why you might want to use it.
>> 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.
>
> Isn't using the same from and to url as default (as is the case now)
> enough?
The problem is that the users are getting confused between to/from and
source/dest. They want to merge branch into trunk, and they are setting
From: Branch @ HEAD
To : Trunk @ HEAD
which is not what they want.
Simon
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 13 17:06:14 2005