=== wedgwood is now known as Guest24594 | ||
=== zyga_ is now known as zyga | ||
mthaddon | am I misunderstanding how diff options work, or is http://paste.ubuntu.com/7068140/ failing to respect -x? I'd expect it to not say that the revision file has differed | 15:17 |
---|---|---|
mthaddon | hmm, looks like it could be https://bugs.launchpad.net/bzr/+bug/268135 | 15:20 |
ubot5 | Ubuntu bug 268135 in Bazaar "bzr commit -x doesn't change the --show-diff output (iter_changes does not support excludes)" [Medium,Confirmed] | 15:20 |
mthaddon | or maybe not | 15:22 |
jelmer | mthaddon: -x takes a pattern IIRC, not a basename | 17:38 |
mthaddon | jelmer: I tried http://paste.ubuntu.com/7068864/ as well, but that doesn't seem to work either | 17:39 |
jelmer | mthaddon: ah, looks like -x doesn't work unless you specify -r | 17:41 |
jelmer | and even then, only works for files *inside* of the directory arguments you pass in | 17:41 |
mthaddon | jelmer: so what would I need to to exclude the revision file here? I can't seem to do it even with -r | 17:43 |
mgz | jelmer: does the {relpath} config thing work with colocated branches do you recall? | 17:43 |
jelmer | mthaddon: it invokes diff manually for each file, so -r is pointless | 17:43 |
jelmer | mgz: it works with the bzr-colo style, not sure about the builtin ones | 17:44 |
mthaddon | jelmer: sounds like there's no way of getting it to do what I'm trying to do, right? I should just go with filterdiff instead? http://paste.ubuntu.com/7068197/ | 17:45 |
jelmer | mthaddon: yes, I don't think it's possible at the moment with 'bzr diff'. | 17:46 |
mthaddon | ok, thx | 17:47 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!