Wiz_KeeD | Hey guys | 08:48 |
---|---|---|
Wiz_KeeD | I did a mistake and commited the wrong values | 08:48 |
Wiz_KeeD | then I did bzr uncommit which reverted to the previous revision, but now I see that bzr status indicates I have uncommited files "Which indicate the changes from the commited version are still there" | 08:49 |
Wiz_KeeD | How do I update the tree so it's exactly like the previous revision? bzr update doesn't work | 08:49 |
Wiz_KeeD | Ah..i think bzr-revert --no-backup | 08:50 |
fullermd | Uncommit just moves you back to before the commit, it doesn't change the WT files. | 08:51 |
Wiz_KeeD | yeah figured that out XD | 08:58 |
Wiz_KeeD | so revert updates the wt to the current revision | 08:58 |
Wiz_KeeD | if no -r is specified | 08:58 |
Wiz_KeeD | I guess that solved it | 08:58 |
Wiz_KeeD | phew! | 08:58 |
Wiz_KeeD | did a boo-boo on the production server :( | 08:58 |
fullermd | It wasn't a boo-boo. It was an experiment. That somebody OTHER than you screwed up, and you had to clean up. | 09:00 |
Wiz_KeeD | too bad i'm not only person working on the project XD | 09:26 |
Wiz_KeeD | let's not forget about the mean l33t h4x0rz! | 09:26 |
LeoNerd | Bah.. I -really- hate when bzr up decides the branches have diverged and so does a merge instead. How can I turn that off, so it just rejects it? | 12:44 |
LeoNerd | In 99.9% of the time I want to rebase in that situation | 12:44 |
computa_mike | I have a question about BZR - If I change the date updated or modified for a file, does Bzr record that information - or can I force it to? | 17:56 |
LeoNerd | I don't believe bzr tracks ctime/mtime | 17:56 |
computa_mike | LeoNerd: That's what I've found so far playing with BZR - I was just wondering if there was some magic flag I could use or a different client etc. | 17:57 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!