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

Re: Missed files after reintegrate

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sun, 17 Aug 2008 09:23:22 +0200

Silver Zachara wrote:
> Hi,
>
> I have 2 branches now(there are more, but this isn't crucial). First
> branch is trunk and second is feature branch form same language changes.
> This feature branches I have created in 40 revision(I am attaching
> revision graph and log for better orientation). My problem is that I
> have added two files in to the trunk a button_09.gif in the 48 rev and a
> reset.css in the 49 rev. Now I have done two merges(in both cases I have
> used "Merge a range of revision" method) and it 42-50 from trunk to
> this feature branche(in this merge was above two files) and 54-61 from
> trunk to the feature branch at well.
> In the 63 rev I have reintegrate this feature branch back to the trunk
> and here is the problem. Every thing was merged without problems(some
> conflicts but this I have resolved), but above two files was deleted
> from trunk.(in 65 rev I have added this files back) (when I have
> switched to the feature branch before reintegrate, above to files didn't
> there) How it's posible ? Is this behavior normal ? When I have tested
> this on simple project and when I have merged revisions where was added
> some files, this files was copied to the feature branch, but in my
> project didn't.
>
> Can you explain my this ? Thank you

There are some bugs in the merge code which the Subversion developers
are fixing as soon as they're discovered. I'm not sure if yours is among
them.
Can you maybe ask on the Subversion mailing list for more information?
(users at subversion tigris org)

Stefan

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

Received on 2008-08-17 09:23:45 CEST

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