/srv/irclogs.ubuntu.com/2010/05/29/#bzr.txt

mtaylorbzr: ERROR: bzrlib.errors.ShortReadvError: readv() read 72 bytes rather than 805 bytes at 0 for "edc52d2d94b242f1cd3a2ccac6e0dad5.tix"01:23
siliIs there a clever way to show a diff of changes since the branch was created?04:27
silidoing a diff against the parent branch works, but doesn't offer the results I want after the branch has already been merged, so I usually have to specify the revision it was branched at04:31
=== BasicPRO is now known as BasicOSX
spivsili: bzr diff -rancestor::parent08:36
spiv(If the parent branch is also the submit branch, then "bzr diff -r submit:" is a shorter way to do the same thing)08:39
silispiv: what does it mean if that doesn't show any diff?10:40
spivsili__: that there's no change in the tree contents between the revision you branched from and the current revision10:57
spivsili__: perhaps look at the output of "bzr missing --mine", or perhaps look at the locations listed in "bzr info" if that isn't what you expect10:58
spivIf this is a branch intended for merging into another, perhaps see what 'bzr merge --preview YOUR_BRANCH' in a checkout/branch of the target branch is.11:00
sili__hmmm13:06
damdwhat is the difference between "bzr update" and "bzr pull"?16:10
damdthe former takes several megabytes more than the latter when performed on emacs trunk16:10
=== nlisgo_ is now known as nlisgo
=== wilx_ is now known as wilx
=== nailuj24_ is now known as nailuj24
mtayloranybody have any idea what bzr: ERROR: bzrlib.errors.ShortReadvError: readv() read 72 bytes rather than 805 bytes at 0 for "edc52d2d94b242f1cd3a2ccac6e0dad5.tix" is about?18:40
mtayloroh - nevermind... wft?18:42
=== radoe_ is now known as radoe
=== _thumper_ is now known as thumper
timClicksnoob q: is it possible to delay committing some changes to the next commit? I have changed two files and would like to spread the changes between two commits because they don't have much to do with each other22:52

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