[07:17] <MeaCulpa> merge from non-common ancestor... howto?
[07:18] <MeaCulpa> Hi guys, I have a project dir under bzr control. Now I want to make a branch, containing only small txt files, delete those big files, and push to elsewhere. How can I merge it into original treee WITHOUT deleting the files I excluded in this branch?
[07:19] <MeaCulpa> Do I have to specify the revision number the after the deleting action each time I merge?
[07:49] <lifeless> MeaCulpa: yes, or you have to edit the merge before committing and revert the deletion of the big files.
[07:49] <lifeless> MeaCulpa: why do you want to delete the files?
[07:51] <MeaCulpa> lifeless: I figured out... I should have used the DELETED brance as master tree
[07:51] <MeaCulpa> lifeless: And then add in those big files in another branch
[07:51] <MeaCulpa> So they share same ancestor
[07:52] <MeaCulpa> lifeless: My need is simple: My work have both binary and sourcecode/doc, I use ftp to store all of them, which is slow but unlimited in space
[07:53] <MeaCulpa> and use Dropbox to store source/doc, which is fast, portable but lack space
[07:53] <MeaCulpa> So now I working on the branch which pushed to dropbox, and keep thoese management chart shit in ftp
[07:54] <MeaCulpa> Have to work like this unless human beings eliminate excel
[12:02] <n00b99> is there a way to find when a particular line in a file was added/modified?
[12:14] <LeoNerd> blame/annotate  ?
[12:21] <n00b99> blame shows only the most recent revision for a particular line
[12:22] <n00b99> if there were something that showed me all revisions which include a change to a given line that might be useful
[20:33] <alkisg> Hi, what do I need to transfer to another PC in order to be able to push to my launchpad bzr branches? ~/.bazaar and what else, ~/.gnupg?
[20:38] <alkisg> Ah, .ssh, got it