When manually resolving directory conflicts isn't a feature

[Stephen J. Turnbull]

The other thing I can think of is using a script that does "make clean;
bzr switch" for you.  This is probably a better idea than asking bzr
to guess.

Mary Gardiner writes:

 > On Tue, Apr 07, 2009, Stephen J. Turnbull wrote:
 > > thesis.tex and wp.tex contained the "chapter-level" sectioning
 > > commands, and then \input the text from the subdirectories.
 > 
 > I have a bunch of conference papers and drafts of papers
 > (experiment proposals and writeups) that don't fit in the thesis
 > structure (yet). It's these that I am creating new directories for
 > regularly.

That's what wp.tex (working-paper.tex) is for.  The idea is that for
the thesis you do

\chapter{Introduction}
\input ch1
\chapter{A random walk through topic A}
\input walk
...

and for the working papers you do

\title{A random walk through topic A}
\input walk

where walk lives in a directory of its own, which contains only
version-controlled material.  If you have stuff that doesn't fit into
the working paper format, create a format for it (proposal.tex,
experiment-plan.tex, etc.).

But the main point is to get your build products away from the
version-controlled stuff.  I don't care if you use my particular
directory organization, but I can tell you it worked for me, and some
similar tweak should work for you in your directory organization.