When manually resolving directory conflicts isn't a feature

[Talden]

On Tue, Apr 7, 2009 at 7:00 PM, Mary Gardiner <mary at puzzling.org> wrote:
> I should add that I'm not really interested primarily in the question of "how
> can I arrange my LaTeX files so as to avoid triggering this series of bugs?"
> I've been triggering these bugs regularly since at least 2007: both in my
> writing and my coding I am in the habit of creating new directories fairly
> regularly, and apparently make use of directory hierachies more than many
> people. Answers along the lines of "you don't need that many directories,
> surely" don't seem appropriate somehow. The tool should allow me to create new
> directories in branches and switch back and forth easily, and then my use of
> directories is between me and whichever unfortunates have to work on my
> codebase(s). The use case was supplied more as a concrete example of someone
> having problems than as something needing debugging in and of itself.

These 'bugs' are no different to what is present in Subversion and we
use folder hierarchies extensively (as will any java development shop)
- we just don't tend to end up with unversioned content in folders
that don't exist in all relevant branches.

Of course most of us (my team) tend to have more than one working copy
to switching between distantly related branches is unlikely and so we
don't tend to hit this problem much.

So I don't think this is so much that you use directories a lot more
but that you use technologies or build processes that scatter
unversioned content throughout the hierarchy.  Perhaps there are
output options in your build processes that might prevent this.

Better functionality might be nice but I can see that it's non-trivial
to solve and that there are workarounds that many other people must be
using almost regardless of their VCS tool.

--
Talden