=== superfly is now known as superly | ||
=== superly is now known as superfly | ||
awilkins | Probably a common and stupid question but googling answer is hard | 12:19 |
---|---|---|
awilkins | What's the equivalent of git rebase -i in bzr | 12:19 |
awilkins | Want to remove one revision from the history of a branch | 12:19 |
awilkins | Hum, in other words : https://bugs.launchpad.net/bzr-rewrite/+bug/243150 | 12:21 |
ubot5 | Ubuntu bug 243150 in bzr-rewrite "support -i flag as per git" [Wishlist,Triaged] | 12:22 |
awilkins | May just reverse CP this revision | 12:22 |
jelmer | awilkins: yeah, sounds like it | 13:12 |
awilkins | jelmer, Reverse cherry pick was more appropriate to this case anyway | 13:12 |
jelmer | ah, cool | 13:14 |
=== [emmajane] is now known as emmajane | ||
=== emmajane is now known as ejfood | ||
=== ejfood is now known as emmajane | ||
=== jordan_ is now known as jordan | ||
achiang | when doing a bzr merge of a branch, is there a shortcut to have the commit message just say what branches i pulled from? | 21:28 |
achiang | i'd settle for any type of shortcut/boilerplate for a merge commit message | 21:29 |
rozzin | achiang: "bzr commit -m"? | 23:41 |
achiang | rozzin: i still have to supply an arg for -m right? | 23:44 |
jelmer | achiang: yep | 23:45 |
jelmer | achiang: there is nothing like what you're asking for AFAIK | 23:46 |
achiang | so that's not a shortcut at all | 23:46 |
jelmer | it would not be hard to do a hook around 'bzr merge' that sets a proposed commit message | 23:46 |
achiang | jelmer: darn, too bad. it's just a little papercut, but i find myself frustrated every time i trip over it | 23:47 |
jelmer | achiang: I'm sure patches are welcome :) | 23:48 |
achiang | jelmer: i think i'd rather just build up scar tissue ;) | 23:48 |
jelmer | heh | 23:53 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!