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

Problem when branching + switching from wc

From: Fernando P. Nájera Cano <subversion_tigris_org_at_fernandonajera.com>
Date: 2006-03-24 23:02:22 CET


The other day I run into a problem when trying to apply my know-how to
this problem:

1. You have a version, say r2

2. You make some changes, say r3

3. A bug was found at r2 (also r3) so you fix and commit, say r4. This
commit creates a new folder.

4. You try to backport r4 into r2, that is, you a) update wc to r2, b)
merge r4 on it, c) commit into a new branch and d) switch your wc to
that branch.

5. WC is then broken because of that folder created on step 3. No
matter if you try to update, to revert or to delete the problematic
folder, you are stuck.

Although there are other ways to do this (for example, create a branch
from r2, switch to that branch, and apply the merge there), the above
steps seemed logical to me.

I don't know if this is a bug or a known-issue, but I thought it was
worth to report here.

Best regards,

Fernando Nájera

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Received on Fri Mar 24 23:04:27 2006

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