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

Re: Merge works fine with Turtoise but not with my command line

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 17 Jun 2009 19:51:20 +0200

monoc wrote:
> But no change if I use the option '--force' with the command line..
>
> $> svn merge ^/trunk --force
> --- Merging r2 through r5 into '.':
> C file1
> A file2
> Summary of conflicts:
> Tree conflicts: 1
>
> $> svn st
> C file1
> > local obstruction, incoming add upon merge
> A + file2

According to your description on how you created your test repository,
there shouldn't be any conflict at all when merging.
Are you using svn 1.6.2? If not, please update to the latest version and
try again - there have been some bugs fixed related to tree conflicts.

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=2362924
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-06-17 19:51:44 CEST

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