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

RE: Merge Question: "Working Files"

From: White, Daniel E. <dwhite_at_witsusa.com>
Date: 2005-05-02 20:02:14 CEST

All I know is that he claims to have lost some files. Much as I would
like to, it would not help the situation to say "Serves you right for
not adding them to the repository."

I trust you when you say Subversion will never delete files. I am not
entirely certain what he did. I am not certain he did not merge the
trunk into the branch instead of the other way round, but then not even
that should have deleted files.

-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]
Sent: Monday, May 02, 2005 12:25 PM
To: White, Daniel E.
Cc: users@subversion.tigris.org
Subject: Re: Merge Question: "Working Files"

On May 2, 2005, at 11:04 AM, White, Daniel E. wrote:

> I am admin-ing a Subversion repository and I am new to this tool.
> BTW, so far, I like it. Lots of improvement from CVS.
> Anyway, I have to roll up a snapshot of the repository for a delivery
> and thus instructed all the developers to merge their work to the
> trunk.
> One developer had the following issue/complaint: In his branch
> directory, he had files that had never been "registered" to the
> repository (with svn add). The merge operation made these files
> disappear.
> Is this a bug or an expected effect of the merge ?

You need to be a lot more specific. What exactly did the developer do?

Subversion will never, ever, ever delete unversioned files. Ever.

So the 'svn merge' command couldn't have deleted his unversioned files.
  Perhaps what the developer means is: he forgot to add unversioned
files to his branch, so that when he merged his branch, the file never
appeared on the trunk... which is exactly to be expected. The 'svn
merge' command compares two repository trees and applies the
differences to a working copy. If the two repository trees don't have
the file he forgot to commit, then there's nothing more to be said,
other than "don't forget to commit the file."

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 2 20:06:14 2005

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

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