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

Merge not working ?

From: Ferry Barrois <fbarrois_at_gmail.com>
Date: 2006-07-18 13:01:47 CEST

Hi All,

I see the following problem :

Create repository with branches,tags,trunk using import
Import file a.c into trunk
modify a.c
create branch of a.c to /branches/test1
switch working copy to /branches/test1
edit a.c in test1
commit changes

Now I want to merge the changes from a.c in test1 to the trunk.
So :

I create new directory and checkout trunk
Select Merge : from /braches/test1 to /trunk in working copy dir

Now the Dry Run options shows the files which have changed.
If I select Merge the dialog says the file a.c is updated

However when i look at the file no change is made and also the overlay icons and
status command show no difference.

I'm i doing something wrong or is this a bug ?

-- 
Greetings,
F. Barrois
---
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Jul 18 13:02:30 2006

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