Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: TortoiseSVN not merging

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Re: TortoiseSVN not merging

Author simonlarge
Full name Simon Large
Date 2009-01-28 12:02:29 PST
Message 2009/1/28 <postmaster at tigris dot org>:
> Hi,
>
> I have a branch of trunk that was used for our System Tests. Inside this test branch there were a few changes to documentation as well as test results and things that were checked in. However, when I go to merge (v 1.5.4 I believe) the test branch back into trunk it just says :Finished!" without making any changes. What could be causing this to happen?

There are several ways of merging. You'll have to tell us what you did
before you can expect a sensible response.

Simon

--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net

« Previous message in topic | 2 of 5 | Next message in topic »

Messages

Show all messages in topic

TortoiseSVN not merging postmaster at tigris dot org postmaster at tigris dot org 2009-01-28 09:49:02 PST
     Re: TortoiseSVN not merging simonlarge Simon Large 2009-01-28 12:02:29 PST
         RE: Re: TortoiseSVN not merging postmaster at tigris dot org postmaster at tigris dot org 2009-01-28 18:21:20 PST
             Re: TortoiseSVN not merging steveking Stefan Küng 2009-01-28 22:16:00 PST
         RE: Re: TortoiseSVN not merging tigris at bakermatt dot com tigris at bakermatt dot com 2009-01-28 18:32:12 PST
Messages per page: