glen | hey, i did bzr merge ../some/other/branch; removing changes i did not want to merge this time with bzr revert. but i want to merge from branch again, i.e the same changes i did revert in first place :( | 08:04 |
---|---|---|
jelmer | glen: bzr will think it has already merged those revisions which you partially reverted | 10:04 |
jelmer | you can still merge those changes by explicitly specifying the range of revisions you want to merge | 10:05 |
glen | jelmer: thanks. will try | 10:10 |
=== yofel_ is now known as yofel | ||
poolie | glen, hi, you should just give explicit revision numbers for the bits you want to merge again | 12:26 |
poolie | eg bzr merge -r 9100.. ../other | 12:26 |
daveb_ | so, what does bzr do when it finds a device file? | 23:02 |
poolie | hi daveb_, i guess it depends where it finds it | 23:03 |
poolie | if if it's in the working tree it should be just skipped | 23:03 |
poolie | you can't add them | 23:03 |
daveb_ | thanks poolie | 23:03 |
fullermd | Well, there go my hopes of branching /dev/zero to work on some optimizations... | 23:04 |
wgz | anything else people find annoying about hydrazine while I'm there? | 23:13 |
fullermd | Getting the hazmat placards right for shipping it? | 23:19 |
wgz | hm, okay, maybe just one more. | 23:47 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!