=== jordan_ is now known as jordan === Kraln- is now known as Kraln [13:05] hello, i am getting difference in my files as properties changed: -x to +x.... any idea about this? [13:05] i hv a dual boot Windows 7 + ubuntu, repos was originally checked out in windows and i am using the same in ubuntu.. now [13:52] wow, 3 minutes waiting for an answer is too much ? Allo ? This is IRC ;) [13:52] SunilJoshi: Don't do that then. [13:53] SunilJoshi: bzr can hide the differences in the underlying file systems involved only if you don't lie to him pretending you're always using the same one. [13:53] *to it (bzr) [13:54] SunilJoshi: The root cause here is that even when bzr tells the file system to *not* change the 'x' property, said file system silently ignores bzr request. [13:55] SunilJoshi: So use different working trees, even if they share the same branch. === yofel_ is now known as yofel [14:57] LarstiQ: Back to this "better diff" en emacs. I just remembered that 'e' is in dvc-diff buffer spawn an ediff session for the file at point. That may be closer to what you were after. [14:58] s/is in/in/ s/spawn/spawns/ === zacts`` is now known as zacts [21:55] What's the easiest way of moving all uncommitted changes in one bzr working copy over to another working copy? [21:56] commit them? [21:58] if you really really want you can bzr diff > ../mypatch and then patch -p0 < ../mypatch [22:01] quotemstr: cd $another; bzr merge $one --uncommitted [22:40] Oooh.. merge --uncommitted :) [22:41] I was going to suggest shelve, move the shelf, unshelve. But that looks neat too [23:01] lifeless: Thanks