When manually resolving directory conflicts isn't a feature

[Nagy Viktor]

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.)

2009/4/6 Mary Gardiner <mary at puzzling.org>

>
> I use Bazaar in what is probably currently an unusual way: I use it to
> manage a
> lot of LaTeX files related to my PhD. This means I create new directories a
> lot
> more than coders do: a new directory for each document. Sometimes I
> foolishly
> don't do this inside a designated trunk branch.


this is not unusual, I do the same ;)

>
> Then I end up in this situation, or something like it:
>
> I'm currently working on two documents in two branches doc-1 and doc-2.
> Each
> contains a new directory not in the other branch.


how many PhDs are you doing at once :)

I just put every project of mine under the same branch, then have
lightweight checkouts to work on a specific project

moreover, I have some non-PhD related work as well, so I have  a shared repo
under what my PhD branch is located

have a nice day!
V
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090406/d0acf023/attachment.htm