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

Re: Files that were deleted from trunk and re-added later, disappear during merge+commit into branch.

From: B. Smith-Mannschott <bsmith.occs_at_gmail.com>
Date: Mon, 1 Jun 2009 12:54:53 +0200

On Sun, May 31, 2009 at 23:34, <michael_at_tigersoft.co.il> wrote:
> Hi ,
>
> We have a strange issue with our svn setup.
> We have server running on Windows 2008 (svn version 1.5.6).
> The client is TortoiseSVN 1.5.6 as well running mostly on Vista machines.
> The usual workflow involves mostly branching from the trunk and merging on a later point.

I'd like to help, but I'm having a hard time following your
description. Could you be more specific?

> While performing merge and then commit the following occurs :
> 1. On first attempt to commit  "Commit failed" message appears.   Reason: "Working copy is not updated"

So this is after you've just performed a merge, yes?
What exactly was the merge command?
And it modified a working copy: of what, the trunk? The branch?
Was said working copy up-to-date before you performed the merge?
If no, why?

> 2. Then working copy update was attempted.

And when you did this update, what kind of changes came down from the
repository?
A file deletion, perhaps?

> 3. As a result some files that were deleted from trunk and deleted in the meantime (after branch was done) also got deleted from trunk.

So files that got deleted from trunk, also got deleted from trunk? Que?

> Is this a known issue?

I can't tell because I'm having trouble with:

What did you do?
What actually happened?
What did you expect to happen?

// Ben

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2357454

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-01 12:56:03 CEST

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