When manually resolving directory conflicts isn't a feature

[Mary Gardiner]

On Mon, Apr 06, 2009, Nagy Viktor wrote:
> I don't use bzr switch and the likes, but I use bzr with LaTeX as well. Does
> adding your unversioned files to bzr ignore solve the problem? (I don't know
> how bzr handles this "not delete non versioned files" situation, but if you
> require it to ignore files, it might manage to really ignore them.)

No, they've been in .bzrignore since about the fourth day of the
project.

> how many PhDs are you doing at once :)

I am publishing (or at least attempting to) during my PhD which means I
have papers and experimental proposals and so on in there.

(Re having separate projects for this entirely as Maritza Mendez, while
it's nice to keep code separate, writing in a PhD tends to merge, as in,
eventually a lot of this text moves into my thesis in some form. It's
actually quite hard to manage that history properly anyway, since I
should also be sure to mark the final version of any paper before it
undergoes further editing to be incorporated into the thesis, but having
to move it in from a separate project of course is suboptimal too.)

-Mary