[06:25] <Meatball_py> hi, how can I change the parent location of a local bzr repo?
[21:40] <mgrandi> boop
[21:44] <jonkirkman> blip
[21:45] <mgrandi> so does nayone know of a bug report with bzr running out of memory when doing a pull / merge?
[22:24] <jelmer> hi mgrandi
[22:25] <mgrandi> hi
[22:25] <jelmer> mgrandi: there are a few
[22:25] <jelmer> bug 109114
[22:25] <jelmer> bug 183156
[22:25] <mgrandi> yeah, thats bad
[22:25] <jelmer> bug 367545
[22:25] <jelmer> bug 650463
[22:25] <mgrandi> i almost borked everything becuase i commited a large file
[22:25] <jelmer> https://bugs.launchpad.net/bzr/+bugs?field.tag=memory
[22:25] <mgrandi> it committed fine, but pull merge and everything else failed
[22:25] <mgrandi> and since it was in the pack file even if i uncommitted, it still failed D:
[22:26] <mgrandi> why does commit work fine but the others don't?
[22:44] <mgrandi> well thanks, ill look at them!
[23:23] <bschaefer> Hello, I've got an interesting problem with a bzr branch. I merged a branch, then reverted that branch. Then pushed a new branch with changes, but the branch I reverted thinks it is apart of that branch...
[23:24] <bob2> do you understand what revert does
[23:24] <bschaefer> I ment reverted the changes done from the merge
[23:24] <bschaefer> and I would hope so
[23:24] <bschaefer> anything that isn't commited to that branch
[23:35] <bschaefer> well now theres a conflict merging a branch, because it thinks it was merged. Though none of the files were merged...just the revisions. soo Im not sure why the files were reverted but not the revision info
[23:43] <spiv> bschaefer: how did you do the revert?
[23:44] <bschaefer> spiv, first I did: bzr merge <branch name>
[23:44] <spiv> bschaefer: did you perhaps do something like "bzr revert file1 file2", or even "bzr revert .", rather than just plain "bzr revert"?
[23:44] <bschaefer> spiv, then just bzr revert
[23:45] <bschaefer> spiv, hmm I don't think so
[23:45] <bschaefer> spiv, usually I just do a normal bzr revert
[23:45] <bschaefer> normally*
[23:45] <spiv> "bzr revert" would have reverted the pending merges (i.e. the revision info) as well as the files, so if that's what you did then it's a mystery how you got into this state.
[23:46] <bschaefer> yes it is...as the files are not with the merge, but the info is
[23:46] <bschaefer> the only way I saw is a bzr merge --included-merges
[23:46] <spiv> Anyway, if you haven't done anything interesting on that branch since that unwanted merge commit, you could bzr uncommit back to just before it.
[23:47] <bschaefer> hmm when I did a bzr uncommit, then commit those changes
[23:47] <spiv> bzr status will report "pending merges" as well as uncommitted file edits and adds.
[23:47] <bschaefer> it has all the info under pending merges, which I wasn't 100% if it would still keep that info with it
[23:48] <spiv> (To be clear, I should say: uncommit, and then revert, so that 'bzr status' is clean.  Or alternatively 'bzr pull -r THAT_REV --overwrite')
[23:48] <bschaefer> but then I still have to merge that to the master branch, which I don't have those rights :)
[23:49] <bschaefer> and uncommiting then revert worked fine,but I wasn't sure how to get that merged over the master branch
[23:49] <spiv> Ah, well, if that master branch already has unwanted changes in it, and you don't have rights to change that branch, it's out of your hands!
[23:49] <bschaefer> shoot...
[23:50] <bschaefer> well Ill have to just poke someone with the rights to get that uncommited...
[23:50] <spiv> You'd have to ask whoever has permission to change the master branch to either also uncommit that revision, which they might not want to do (because it can cause grief if other branches have already branched/pulled that revision), or perhaps commit something on top to get back to an acceptable state.
[23:52] <spiv> Exactly what you and they want to do from here depends on what you want to have happen :)
[23:52] <bschaefer> yeeah, it is just very odd, this is the second time it has happened to me, the it was a while ago
[23:53] <bschaefer> is there any way to revert umm revisions like 723.3.3: http://paste.ubuntu.com/1417835/
[23:54] <bschaefer> but then again im not sure what I would be commiting, as no files are in the branch that are unwanted, just the revision info
[23:55] <bschaefer> spiv, thanks! Ill go poke someone with right to try and get that revert before anything else gets put on top :)