| === sale_ is now known as sale | ||
| === sale_ is now known as sale | ||
| dpm | good morning all | 07:02 |
|---|---|---|
| happyaron | morning! | 07:03 |
| dpm | morning happyaron :) | 07:05 |
| dpm | well, good afternoon to you :) | 07:05 |
| happyaron | dpm: thanks :) | 07:09 |
| kelemengabor | Gwaihir: ping. could you submit a merge proposal for bug #923345 too? I think it would put it up onto the radar of developers. | 12:20 |
| dpm | bug 923345 | 12:22 |
| dpm | oh, bugbot not running? | 12:23 |
| kelemengabor | https://bugs.launchpad.net/ubuntu-translations/+bug/923345 | 12:25 |
| Gwaihir | kelemengabor, will look into it tonight :) | 12:36 |
| kelemengabor | thanks! | 12:36 |
| kelemengabor | dpm: could you help me a little with bzr branch management? | 12:43 |
| kelemengabor | for bug https://bugs.launchpad.net/ubuntu-translations/+bug/923762 | 12:44 |
| dpm | kelemengabor, I can try :) What's the question? | 12:44 |
| kelemengabor | so, the devs asked me to update the proposed branch | 12:44 |
| kelemengabor | because upstream changed | 12:44 |
| kelemengabor | so, I did bzr uncommit, bzr pull, bzr commit the new changes | 12:45 |
| kelemengabor | and bzr push to the same branch fails | 12:45 |
| kelemengabor | bzr: ERROR: These branches have diverged. | 12:45 |
| kelemengabor | I don't want to merge it into the previous, but overwrite it with the new | 12:46 |
| kelemengabor | how do I do that? | 12:46 |
| dpm | let me read the bug first | 12:47 |
| kelemengabor | nevermind, --overwrite is the solution :) | 12:49 |
| * kelemengabor is a potato :( | 12:49 | |
| dpm | s/potato/awesome :) | 12:49 |
| dpm | kelemengabor, I think the only issue here was the 'bzr uncommit' part. Generally, you'd simply do a 'bzr pull' to pull the latest upstream changes | 12:50 |
| dpm | then manually fix any conflicts if there are any | 12:50 |
| dpm | then commit | 12:50 |
| dpm | and then resubmit the merge proposal | 12:50 |
| kelemengabor | okay, resubmit is done, let's hope they will be quicker to review it this time :) | 12:55 |
| dpm | cool | 12:57 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!