| === r0bby_ is now known as robbyoconnor | ||
| === SamB_ is now known as SamB | ||
| === robbyoconnor is now known as robbyoconnorVi | ||
| === robbyoconnorVi is now known as robbyoconnor | ||
| Laney | hello #bzr | 13:39 |
|---|---|---|
| Laney | I got sent here from #ubuntu-devel to ask if there's an equivalent of `git reset --hard origin' in bzr | 13:40 |
| LeoNerd | Maybe. How about explaining what it does, for the majority of us who don't know it | 13:42 |
| Laney | Ok, thanks for the welcome. It resets your working state to the remote repository's. So if you were doing it separately: uncommit -r <last common revision>, revert, then pull. | 13:46 |
| LeoNerd | Ah.. hmm.... | 13:47 |
| fullermd | I think it's more like a pull --overwrite, followed by a revert. Except pull --overwrite already does the revert-ish stuff anyway. | 13:48 |
| Laney | In git you'd have fetched the state already so it doesn't explicitly pull, but you don't have that in bzr. | 13:48 |
| LeoNerd | But if you are simply ahead of upstream, pull will do nothing surely? | 13:48 |
| Laney | Someone did tell me about pull --overwrite, but I wasn't sure if that did the expected thing or not. | 13:48 |
| Laney | Like if you are ju, yeah that | 13:48 |
| fullermd | ('s only important in other modes like --soft, where the pull --overwrite would has squirreled you) | 13:48 |
| zyga | Laney: bzr revert | 13:49 |
| LeoNerd | pull --overwrite will replace diverged history, but if you just have more commits on top of upstream it'll just say it has nothing to do | 13:49 |
| zyga | er | 13:49 |
| zyga | origin you say | 13:49 |
| fullermd | No it won't. It makes the upstream state always win. | 13:49 |
| LeoNerd | Huhreally? | 13:49 |
| zyga | Laney: bzr pull --force :parent maybe | 13:49 |
| fullermd | No, it's --overwrite. pull doesn't have a --force. | 13:50 |
| Laney | zyga: --overwrite, but yeah, that's what they're saying (I think :parent is implied) | 13:50 |
| zyga | Laney: :parent may not be implied :pull is implied | 13:50 |
| Laney | If you want to replace your local changes and just want your branch to | 13:51 |
| Laney | match the remote one, use pull --overwrite. This will work even if the two | 13:51 |
| Laney | branches have diverged. | 13:51 |
| zyga | Laney: just use git-lp | 13:51 |
| Laney | seems like the thing | 13:51 |
| zyga | Laney: much much less hassle | 13:51 |
| fullermd | I don't think there _is_ a :pull. Pull uses :parent. | 13:51 |
| mvo | zyga: is that a package? | 13:51 |
| zyga | mvo: no, it's not a package, just one script to add to path | 13:52 |
| zyga | http://zyga.github.io/git-lp/ | 13:52 |
| * mvo looks | 13:52 | |
| fullermd | I guess maybe you could make one yourself; the location aliases might be dynamic enough for that, I don't remember. | 13:52 |
| zyga | strings attached but we use it daily and it really works | 13:52 |
| zyga | strings == only one workflow tested | 13:52 |
| === SamB_ is now known as SamB | ||
| === WebbyIT is now known as rpadovani | ||
| === tinoco is now known as tinoco-away | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!