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

Re: Weird conflicts for no reason

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 10 Oct 2008 23:14:55 +0200

Robert Dailey wrote:
> On Fri, Oct 10, 2008 at 3:53 PM, Stefan Küng <tortoisesvn_at_gmail.com
> <mailto:tortoisesvn_at_gmail.com>> wrote:
>
> Maybe you can get a reproduction recipe if you try something with the
> same filename/path that give the error?
>
>
> I'm not sure what you mean by this. Can you explain?

If you could come up with some steps on how I could reproduce this, for
example:

* create empty repo
* import structure
  /trunk/dir/file1
  /trunk/dir/anotherfile
  /branches
* copy trunk to /branches/testbranch
* modify file1
* commit
* checkout branches/testbranch
* merge trunk rx:y to testbranch wc

something like this would help a *lot*.

Stefan

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

Received on 2008-10-10 23:15:10 CEST

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