=== matttbe1 is now known as matttbe
=== guiverc2 is now known as guiverc
[06:29] <sudip> I uploaded my first merge, so unsure about the process about what I need to do with the merge proposal I have opened in git-ubuntu. I have marked it as approved. but how will it get merged in git ?
=== juergh_ is now known as juergh
[07:45] <dviererbe> Hi, I just finished merging dash from unstable & testing it. Could someone review  & sponsor it? https://code.launchpad.net/~dviererbe/ubuntu/+source/dash/+git/dash/+merge/468780
[08:19] <adrien> sudip: your changes are not merged through git, instead it's re-imported in git based on what was uploaded
[08:20] <adrien> in some cases (not sure which), the history can be preserved in the re-import
[08:22] <sudip> hmm.. ok.. thanks adrien, though juliank uses some extra options in the builds so that the bot merges the branch... I tried to use that but didn't work in my setup, I will look over this weekend why..
=== pushkarnk1 is now known as pushkarnk
[08:49] <juliank> adrien: sudip: to get it merged you gotta pass $(git-ubuntu prepare-upload args) to the build command or I think it also has a mangle command to mangle the .changes file, that's where it adds a bunch of fields indicating the repository and commit to merge
[08:51] <sudip> juliank: yeah, I tried that by my dpkg-genchanges failed, I will check later tonight why.
=== pushkarnk1 is now known as pushkarnk
[09:02] <sudip> juliank: found the problem... :(
[09:02]  * sudip is so ashamed of himself now  :(
[10:04] <Skia> mapreri: ddstreet: did you see https://code.launchpad.net/~hyask/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/468091 ? It fixes a long standing bug, and is pending review :-)
[16:15] <ahasenack> @pilot in
=== ChanServ changed the topic of #ubuntu-devel to: Archive: open | Devel of Ubuntu (not support) | Build failures: http://qa.ubuntuwire.com/ftbfs/ | #ubuntu for support and discussion of Focal-Noble | Patch Pilots: ahasenack
=== ChanServ changed the topic of #ubuntu-devel to: Archive: open | Devel of Ubuntu (not support) | Build failures: http://qa.ubuntuwire.com/ftbfs/ | #ubuntu for support and discussion of Focal-Noble | Patch Pilots: N/A
[19:15] <ahasenack> @pilot out
[20:02] <sergiodj> @pilot in
=== ChanServ changed the topic of #ubuntu-devel to: Archive: open | Devel of Ubuntu (not support) | Build failures: http://qa.ubuntuwire.com/ftbfs/ | #ubuntu for support and discussion of Focal-Noble | Patch Pilots: sergiodj
[20:32] <sudip> juliank: that worked, git-ubuntu bot has merged  :)
[20:52] <juliank> Hooray