| dorian_ | Hey there. I hit 'bzr revert' by mistake. Some file were backed up under the file.d.~#~ convention. Some were not. Do you know if I can find the missing backup files ? | 15:01 |
|---|---|---|
| LeoNerd | 'revert' tries to check if the outstanding edit is due to a 'merge' or similar operation | 15:02 |
| LeoNerd | I.e. something that didn't involve human effort to create and can be rebuilt by applying the same operation if necessary | 15:02 |
| dorian_ | LeoNerd, like unshelve ? | 15:05 |
| LeoNerd | Ah.. mmmm | 15:05 |
| LeoNerd | Yes that tricky little cornercase ;) | 15:05 |
| dorian_ | are the unshelved patch stored somewhere ? | 15:05 |
| LeoNerd | I don't know what happens to unshelve'd changes, whether that is preserved somewhere | 15:05 |
| LeoNerd | Last time I looked I couldn't find one | 15:05 |
| dorian_ | where can I find help about this ? I might have lost a day worth of work | 15:06 |
| dorian_ | I want to make sure before starting over | 15:06 |
| LeoNerd | Take a look under the .bzr/checkout/shelf directory and see if there's leftover files in there | 15:07 |
| dorian_ | nope | 15:09 |
| fullermd | An unshelved change should be the same as a manual one; bzr doesn't know where it came from... | 15:09 |
| mgz | dorian_: pastebin the log section of the failed unshelve operation? | 15:09 |
| mgz | everything should generate conflicts/orig files, except when shelve breaks badly | 15:10 |
| dorian_ | mgz, the unshelve operation didn't fail. It's the revert operation which didn't make backups | 15:10 |
| mgz | pastebin that then? revert always makes backups of files that actually have changes in them | 15:12 |
| mgz | also, it's a good habit to just make checkpoint commits in a work branch, even when experimenting | 15:13 |
| mgz | it's pretty easy to pull them out into neater branches later | 15:13 |
| dorian_ | there is nothing is the log of the revert operation which is out of the ordinary | 15:15 |
| dorian_ | the return code is fine also | 15:15 |
| dorian_ | I hope bzr doesn't actually do the revert operation if it doesn't make backup successfully :/ | 15:15 |
| mgz | hm, did were you discarding a pending merge at the same time? | 15:20 |
| mgz | I mean, I'm not sure how you have a days worth of uncommitted changes and decide to type revert, but trying to understand what actually went wrong | 15:21 |
| dorian_ | It's ok. I resigned and accepted that my work is lost. I won't stop using bzr since it's my boss choice either -__- | 15:23 |
| mgz | I'd like to know what you did and help it not happen again | 15:24 |
| * LeoNerd (also suggests commit-early commit-often, but knows that doesn't immediately help the current problem :/ ) | 15:25 | |
| mgz | but I need an actual log to have any idea | 15:25 |
| dorian_ | I wasn't at the latest revision. I had local changes. I hit revert | 15:26 |
| dorian_ | no backup to be found | 15:26 |
| dorian_ | maybe it comes from that | 15:26 |
| LeoNerd | Ah, for that situation I always shelve / pull / unshelve | 15:26 |
| LeoNerd | Treat revert as "Throw away my changes". Those "backup" files are just for accident recovery | 15:27 |
| dorian_ | thanks for you help anyway | 15:27 |
| mgz | hm, I still get a backup file in that case. | 15:29 |
| jvelasquez | how could I see a list of everything managed by bzr? | 23:35 |
| jvelasquez | got it. bzr ls -V | 23:37 |
| fullermd | You may want -R too, depending on the meaning of "everything". | 23:37 |
| jvelasquez | ohh. yea! thanks. | 23:38 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!