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

Re: merge shows redundant updates

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-03-10 19:25:40 CET

Gerasimov, Ivan wrote:

> Just tried 1.3.0.
> It does not show any updates either. Moreover, I couldn't find any way to make it show the updates. Still I find it logical, since both branches are absolutely same.
>
> The docs say:
> ----------
> D.2.20. Merge
> svn merge [--dry-run] From_URL@revN To_URL@revM PATH
> The Dry run performs the same merge with the --dry-run switch.
> svn diff From_URL@revN To_URL@revM
> The Unified diff shows the diff operation which will be used to do the merge.
> ----------
> And that's exactly how I tried to perform merge with command line client.

Try again, but this time with the --force param. (fixed the docs in
revision 5986).

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Mar 10 19:26:01 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.