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

Re: Merging from the graph

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 14 Jan 2009 20:51:00 +0100

Eddy Quicksall wrote:
> Merging from the graph does not seem to work. It acts like it is merging and in fact says it did but when I check the result it has not.
>
>
>
> I did this:
> 1) made a change to the top node of branch 1
> 2) committed that change
> 3) got a new top node
> 4) right click on the new top node and select “merge revision to…”
> 5) scroll down to a different branch (call it branch 2)
> 6) select the proper folder in branch 2
> 7) click OK
> 8) It says “Merging …” in gray
> 9) It says “Finished!” in black.
> 10) click OK
> 11) take a look at the file in branch 2 and it has not been changed. In fact the date on the file didn’t change either.

Did you show the revision graph for a file? In that case you're right:
merging won't work since you can only specify a folder as the merge target.

This is fixed on trunk now.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1024752
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-01-14 20:51:20 CET

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