=== slank is now known as slank_away | ||
mgz | morning! | 09:10 |
---|---|---|
* fullermd wavels at mgz. | 09:13 | |
mgz | hey fullermd | 09:14 |
=== yofel_ is now known as yofel | ||
=== idnaria is now known as idnar | ||
jml | bzr push lp:~jml/$(basename $(pwd))/`bzr nick` ... *sigh* | 12:55 |
ReekenX | Hello. How to remove file from bzr history? I am in commit 500, and in commit 400 there is Django.tar.gz. I want to remove it and change entire history, but can't find anything on Google.. | 13:47 |
LeoNerd | The chnage you need to make is a history-rewrite operation.. not a simple one | 13:57 |
LeoNerd | DVCSes by their nature don't take kindly to history-rewrite | 13:57 |
LeoNerd | You -can- do it but it will be very disruptive to anyone who has taken a branch of your project since -r400 | 13:57 |
ReekenX | LeoNerd: I know there will be some bad things to other who already pulled changes. But it doesn't matter, they can clone repository starting from new. So I still want to learn to rewrite history somehow. | 13:59 |
LeoNerd | What I suggest is to rename the current branch (it's just a directory on the filesystem, to something like foo.BROKEN) | 13:59 |
LeoNerd | Then branch that at the revision before (-r399), and use replay to replay every commit from -r401 onwards. This will give you a branch in which -r400 is entirely missing from history | 14:00 |
LeoNerd | (The original -r400) | 14:00 |
LeoNerd | If you want to preserve numbering, you could create a new -r400 at that point, which is empty | 14:00 |
LeoNerd | If -r400 contained anything else that you still wanted to keep, you'll have to pull that in as well at that point | 14:00 |
LeoNerd | Plus this way, nothing can go wrong because at worse, you still have the original branch :) | 14:04 |
LeoNerd | [TM] | 14:04 |
ReekenX | LeoNerd: Thanks for the tips. Trying to do that right now. | 14:12 |
ReekenX | I have a file ./.bzr/repository/packs/d3cfd48157817d9c08ef3c8636b74329.pack which is 390 MB. Maybe it's possible to unpack it? | 15:22 |
xnox | LeoNerd: what you want is filter-branch like functionality. there is experimental code to do that https://code.launchpad.net/~asabil/bzr-rewrite/filter-branch | 17:17 |
LarstiQ | ReekenX: unpack won't be helpful, but repacking might | 17:17 |
xnox | LeoNerd: or you can bzr fast-export / fast-import with filter. | 17:18 |
xnox | to achieve removing part of the history (e.g. offendings commits that touch .that binary blob) | 17:18 |
LeoNerd | Oh, true | 17:19 |
LeoNerd | I was presuming there was just a single add commit then it was never touched | 17:19 |
=== SamB_ is now known as SamB | ||
ReekenX | Thanks xnox and LeoNerd - everything solved using bzr fast-import/export | 18:02 |
LeoNerd | :) | 18:02 |
xnox | =)))) \o/ | 18:03 |
=== deryck is now known as deryck[lunch] | ||
=== deryck[lunch] is now known as deryck | ||
=== ReekenX is now known as ReekenX|AFK | ||
=== lamont` is now known as lamont |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!