| === jordan_ is now known as jordan | ||
| === Kraln- is now known as Kraln | ||
| SunilJoshi | hello, i am getting difference in my files as properties changed: -x to +x.... any idea about this? | 13:05 |
|---|---|---|
| SunilJoshi | 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:05 |
| vila | wow, 3 minutes waiting for an answer is too much ? Allo ? This is IRC ;) | 13:52 |
| vila | SunilJoshi: Don't do that then. | 13:52 |
| vila | 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 |
| vila | *to it (bzr) | 13:53 |
| vila | 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:54 |
| vila | SunilJoshi: So use different working trees, even if they share the same branch. | 13:55 |
| === yofel_ is now known as yofel | ||
| vila | 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:57 |
| vila | s/is in/in/ s/spawn/spawns/ | 14:58 |
| === zacts`` is now known as zacts | ||
| quotemstr | What's the easiest way of moving all uncommitted changes in one bzr working copy over to another working copy? | 21:55 |
| ali1234 | commit them? | 21:56 |
| ali1234 | if you really really want you can bzr diff > ../mypatch and then patch -p0 < ../mypatch | 21:58 |
| lifeless | quotemstr: cd $another; bzr merge $one --uncommitted | 22:01 |
| LeoNerd | Oooh.. merge --uncommitted :) | 22:40 |
| LeoNerd | I was going to suggest shelve, move the shelf, unshelve. But that looks neat too | 22:41 |
| quotemstr | lifeless: Thanks | 23:01 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!