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

RE: Switching

From: John Maher <JohnM_at_rotair.com>
Date: Thu, 22 Aug 2013 16:40:23 +0000

I don't think you even tried Thorsten,

I can easily. There are actually several options.

1) When switching branches don't raise a conflict if all the files in the directory are in the global ignore list. And if all that exists in a directory are files to be ignored it makes logical sense to ignore the parent directory.

2) A parameter could be passed to the switch command to ignore any directory that ends up with only files on the global ignores list.

3) An OK-to-delete-if-in-conflict property could be created.

And I don't even know the tool well, if I knew it better I can come up with even better solutions. I'm not going to bother listing any more alternatives, there are plenty. Might as well wish I had a candy bar right now. Its OK to wish, but it won't happen. I'll bet any talented developer could come up with a solution if they tried.

-----Original Message-----
From: Thorsten Schöning [mailto:tschoening_at_am-soft.de]
Sent: Thursday, August 22, 2013 12:21 PM
To: users_at_subversion.apache.org
Subject: Re: Switching

Guten Tag John Maher,
am Donnerstag, 22. August 2013 um 17:48 schrieben Sie:

> Actually I would call the problem the way I am using the tool.
> Since no one has provided a better solution there may not be one.
> Perhaps no one considered switching between branches where there could
> exist a directory with unversioned files in one and not the other. I
> don't know. Maybe no one wanted to make it work since they never
> needed that feature. I don't know. After reading tons of material on
> subversion I thought it would be good to keep development for
> individual features in separate branches. But the cost is easily out
> weighing the benefit.

How would you like Subversion to work in your case? From my understanding it breaks down to something generated some files for some reason in one of your branches and now you want to switch form that branch to another which does not contain the base directory of the generated files. What should subversion do with your generated files it doesn't know anything about?

I don't see how this problem can be solved by any tool.

Mit freundlichen Grüßen,

Thorsten Schöning

Thorsten Schöning       E-Mail:Thorsten.Schoening_at_AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/
Telefon...........05151-  9468- 55
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04
AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Received on 2013-08-22 18:41:46 CEST

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.