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

Hide all messages in topic

All messages in topic

Re: TortoiseSVN not merging

Author steveking
Full name Stefan Küng
Date 2009-01-28 22:16:00 PST
Message postmaster at tigris dot org wrote:
> I've tried the list of revisions merge and the branch reintegration
> merge. Both give me the same "Finished!" response without actually
> merging anything.

Are you aware of the fact that the merge dialog has a lot of input
controls like checkboxes, edit boxes to enter revisions, ...?
When Simon asked you for information about your merge, *that* was what
he was asking for.
So again:

What did you enter in the merge dialog?

Stefan

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

RE: Re: TortoiseSVN not merging

Author tigris at bakermatt dot com
Full name tigris at bakermatt dot com
Date 2009-01-28 18:32:12 PST
Message I've tried both Merge List of Revisions and Reintegrate a branch. When I try to merge the list of revisions I just get the "Finished!" message and it doesn't make any changes. When I try to do the reintegration, it fails and says that it must be ancestrally related to the branch I'm trying to merge to.

I don't know what else to try.

Thanks,
Matt

RE: Re: TortoiseSVN not merging

Author postmaster at tigris dot org
Full name postmaster at tigris dot org
Date 2009-01-28 18:21:20 PST
Message I've tried the list of revisions merge and the branch reintegration merge. Both give me the same "Finished!" response without actually merging anything.

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

TortoiseSVN not merging

Author postmaster at tigris dot org
Full name postmaster at tigris dot org
Date 2009-01-28 09:49:02 PST
Message 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?

Thanks,
Matt
Messages per page: