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