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