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

Unable to merge my changes

From: Grisha <grigory.bloch_at_gmail.com>
Date: Thu, 5 Nov 2009 09:44:45 -0800 (PST)

Hello,

I am working with Tortoise SVN. The server is SVN version is 1.2. The
client is 1.4.8.

I am having issue merging, in particular, I've created a branch but
going through the usual steps (i.e. right click on trunk and then
create a folder name in the branch folder in the same folder the trunk
folder is located).

Now after doing some bug fixing in trunk, I'd like to update my
development branch.
When I try to do so, nothing gets updated. However, when I diff the
two versions I do see the exact files that were modified and should be
merged.

Some info on the way I update my development branch. I right click on
the development branch, I pick the to as trunk and the from as the
development branch. The directory I am doing it with is the
development directory (i.e. branch/Development).

Am I missing something ?
This seems to be a trivial operation, but has been preoccupying me for
the past 2 days.

Pleas help,
Grisha

P.S.
If something is not clear, please let me know and I'll clarify
promptly.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2414827

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-05 19:14:45 CET

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