[pLog-svn] I'm having problems to merge with 1.1.2, what am I doing wrong?

[BalearWeb]

The switch command has worked fine. Thank you. Much
easier.

But I think that I have been using the merge command to merge
my local working copy with the 1.1.1 repository version
until now, but never mind. I think I will still manage without
this command.

Oscar Renalias wrote:
> I don't really understand this interface as I've never had to use it,
> but something doesn't look right.
>
> I think there's no need to do a merge. If you have a 1.1.1 or 1.1
> branch checked out somewhere with your own changes, 'svn switch'
> should be enough (I'm sure TortoiseSVN has this feature somewhere in
> its UI) This will "switch" your current copy to another branch,
> keeping your changes in place and incorporating any changes that have
> already been made to the new branch.
>
> You should only use the merge if you're merging from one branch to
> another, but as far as I can tell that's not the case.
>
> On 10/19/06, BalearWeb <balearweb at balearweb.com> wrote:
>> As I use a graphical interface, I'm attaching you
>> the two screen shots. One is the command and the
>> other the result.
>>
>> Thank you very much for your help.
>>
>> Oscar Renalias wrote:
>> > So first you're checking out the branch from
>> > http://devel.lifetype.net/svn/plog/plog/branches/lifetype-1.1.2,
>> > right? And then where from where to are you merging? What's the exact
>> > command you're using?
>>
>>
>>
>> _______________________________________________
>> pLog-svn mailing list
>> pLog-svn at devel.lifetype.net
>> http://devel.lifetype.net/mailman/listinfo/plog-svn
>>
>>
>>
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.lifetype.net
> http://devel.lifetype.net/mailman/listinfo/plog-svn
>