Re: Files that were deleted from trunk and re-added later, disappear during merge+commit into branch.
Date: Tue, 2 Jun 2009 10:05:35 +0200
Thanks for your help on this issue.
Here are the clarifications about the problem :
>I'd like to help, but I'm having a hard time following your
[A] We're talking about feature branch. We perform merges from trunk to our feature branch on regular basis.
> So this is after you've just performed a merge, yes?
>What exactly was the merge command?
[A] TortoiseSVN: Merge a range of revisions => Next => Next => Merge
>And it modified a working copy: of what, the trunk? The branch?
[A] The branch
> Was said working copy up-to-date before you performed the merge?
[A] It was up-to-date – just one person works on this branch from the same working copy
>A file deletion, perhaps?
> So files that got deleted from trunk, also got deleted from trunk? Que?
[A] After the update and commit we have <myFile> deleted. I believe after merge back (from fetaure branch) we'll have <myFile> deleted in trunk as well.
>I can't tell because I'm having trouble with:
[A] We expect to see <myFile> in the branch working copy in the end of the merge.
Just to reiterate the problem here is the problem desciption again:
-- Best regards, Michael Liberman IT Consultant TigerSoft LTD. Office: +972 (0)8 942 7052 Fax: +972 (0)8 942 0447 Mobile: +972 (0)54 441 3995 E-mail: Michael_at_Tigersoft.co.il ------------------------------------------------------ http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2358661 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].Received on 2009-06-02 09:07:38 CEST
This is an archived mail posted to the Subversion Users mailing list.