=== r0bby_ is now known as robbyoconnor
=== Merwin is now known as ThibautD
vilamgz: morning08:48
mgzhey vila!08:49
=== yofel_ is now known as yofel
ChristopheTHas any of you experienced the bug https://bugs.launchpad.net/bzr-git/+bug/1042102 ?  Do you know a workaround?14:13
ubot5Ubuntu bug 1042102 in Bazaar Git Plugin "dpush "overrides" commits" [Undecided,New]14:13
jelmerChristopheT, that's a known issue14:16
mgz...a workaround would be to just manually check if the branches have diverged before you use dpush?14:17
jelmermgz: yes14:17
ChristopheTjelmer: I did not find a previous report of this.  Is there one?14:18
ChristopheT "manually check": sure but I am sure I am bound to forget now and then!  Maybe a hook?14:19
jelmerChristopheT, I don't see one either yet14:19
jelmerChristopheT, I guess you could implement it as a hook14:20
jelmerChristopheT, though if you have time to spare, a patch would also be great14:21
ChristopheTjelmer: the question is: is it possible? "bzr hooks|grep push" returns "post_push:" only...14:21
ChristopheTjelmer: I'd like to try to understand the issue better (and possibly provide a patch).  I find the issue very annoying...  Where do I start (I guess I also need pointers to understand git protocol or is it just the way bzr handles it)?14:23
jelmerChristopheT, you'll need some knowledge of the bzr and git models14:23
jelmerChristopheT, the relevant code would be in bzr-git's branch.py14:23
jelmerin fact, there is already a FIXME for this14:24
mgzChristopheT: `bzr alias dpush=remember-to-check-if-branch-has-diverged`14:25
mgz...that should be annoying enough to make you want to fix the actual bug instead :)14:26
mgzyou'd need `bzr alias dpush-yes-i-checked=dpush` too.14:27
ChristopheTjelmer: what quick reference do you recommend to get acquainted with git model (I do not even really use git, my coworkers do!).14:37
jelmerChristopheT, the dulwich tutorial is a good start, and has some links to further docs14:38
ChristopheTjelmer: If I understand correctly, the dulwich library possesses the needed functions; the problem is to use them appropriately in bzr-git.14:42
jelmerChristopheT: basically14:44
jelmerChristopheT: or, hmm14:44
jelmerChristopheT, the problem is that git doesn't allow remote graph access so the standard bzr functions don't work to check for diversion14:44
jelmereuhm, divergence14:44
jelmerChristopheT, so you'll have to check locally whether the current remote head is an ancestor of the proposed head (and --overwrite wasn't specified)14:45
ChristopheTjelmer: If I undertand correctly, there is a FIXME missing in InterFromGitBranch._basic_push since it is the code used by the commands in the bug report, right.15:18
ChristopheTAs a short term "solution", I am wondering if is is not better to add an --overwrite flag to dpush (which is what it does ATM) and output an explanation if it is not set.  That will avoid users tripping over this issue and wondering what they have done wrong...15:23
=== deryck is now known as deryck[lunch]
=== deryck[lunch] is now known as deryck

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!