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

[TSVN] Re: Cannot Merge changes made on branch

From: Cameron Tofer <camtofer_at_hotmail.com>
Date: 2005-03-22 21:04:02 CET

>You made the branch from your WC instead of from the repository. In
>other words you copied your WC into the repo, rather than copying HEAD
>to the new branch.
ok, i guess that makes sense. thanks.

>Well branches are created on the server, and if you create one from your
>WC it has to commit that. The fact that there was a space to enter a log
>message was a clue.
i think it's missing the step of allowing me to view what will be committed
and view differences. i think this is really important. or removing this
functionality would probably be the best solution.

>>if i
>>set the revision to one less (#1845) it complains it can't find it.

>Not sure why that doesn't work.

because it doesn't exist. 1846 is the first revision of that tag. from
what i can tell the problem is:

" if you create a branch from your working copy, you will never be able to
merge the changes in that revision with any other branch"

in my mind i shouldn't be able to create a scenario like this but i can. so
far the only solution i see is: "never make a branch from a working copy,
always do this on the server."

>The online version of the subversion book includes quite a bit of
>description of how branching and merging works (updated fairly
>recently). Also the current TSVN help file (also in the nightly) has
>been improved to explain this area better.

thank you, i'll check it out.

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Mar 22 21:08:46 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.