RE: Can't get merge to work as suggested

Hiya,

Can you show us the exact commands which you are issueing?

I recall having some similar problems, which were due to TSVN giving the
wrong merge-commands.

There are 2 forms of using svn merge - I think that whichever form you're
using you should use the other form ;-) and it might work.

I *think* that what's happening, guessing from my own experience, is that
you're effectively merging the changes between branch-at-point-of-creation
and branch-at-head, and putting the result of that merge into your your
trunk-workingcopy.

So you're not merging the changes between trunk-at-head and branch-at-head.

I hope you follow me - I can't find an easy way to explain it.

With regards,

--Tim

-----Original Message-----
From: Tomas Sandkvist [mailto:tomas.sandkvist@protang.se]
Sent: woensdag 3 september 2003 14:04
To: users@subversion.tigris.org
Subject: Can't get merge to work as suggested

Hi!!

Testing out the merge function to learn how it works. I have created a trunk
and a branch of a simple text file with six lines of text.

When I try to merge the branch into the trunk it is replaced by the contents
of the branch. Any changes I've made to the trunk disapears.

A diff on these two files show all differences as it should.

Feel a bit embaressed not being able to figure this out... As far as I can
see i have done everything by the book, still I can't merge such a simple
example.

Everything runs on my local computer, SVN-0.27 is used.

Regards
Tomas Sandkvist

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 3 14:48:50 2003