=== bigjools_ is now known as bigjools | ||
=== wedgwood is now known as wedgwood_away | ||
=== bigjools_ is now known as bigjools | ||
=== mmrazik is now known as mmrazik|lunch | ||
=== mmrazik|lunch is now known as mmrazik | ||
=== wedgwood_away is now known as wedgwood | ||
adamsonj | good mornin' | 14:48 |
---|---|---|
=== mmrazik is now known as mmrazik|otp | ||
=== mmrazik|otp is now known as mmrazik | ||
=== deryck_ is now known as deryck | ||
=== mmrazik is now known as mmrazik|afk | ||
=== deryck is now known as deryck[lunch] | ||
LarstiQ | adamsonj: good evening | 17:31 |
=== deryck[lunch] is now known as deryck | ||
adamsonj | LarstiQ: Good afternoon ;) | 17:57 |
LarstiQ | adamsonj: that would place you somewhere in the americas? ;) | 17:58 |
=== Daviey_ is now known as Daviey | ||
=== mmrazik|afk is now known as mmraazik | ||
=== mmraazik is now known as mmrazik | ||
=== bsd1 is now known as bsd | ||
adamsonj | #latex | 20:17 |
=== beuno_ is now known as beuno | ||
jonathanj | hello! | 20:40 |
jonathanj | i'd like to do something but i'm not sure what the name for it is, which is making it hard to search for | 20:41 |
jonathanj | i have feature branch A that was merged into trunk, other feature branches were merged afterwards, later it was decided that feature A needed to be reverted, so i committed a reverse merge for feature branch X to trunk. now the time has come to merge feature branch X back into trunk, but obviously if i simply try to merge the branch bzr tells me there is nothing to do | 20:42 |
jonathanj | (oh whoops, i mean feature branch X not A at the beginning) | 20:43 |
thumper | abentley: how to I make a working tree match a particular revno? | 21:53 |
thumper | I'm trying to work out which commit introduced a problem | 21:53 |
abentley | thumper: bzr revert -r $revno | 21:53 |
thumper | ta | 21:53 |
lifeless | thumper: you might like bisect too | 21:55 |
thumper | hi lifeless | 21:55 |
thumper | it is only a choice of 3 commits | 21:55 |
thumper | so not too bad | 21:55 |
lifeless | o/ thumper | 21:55 |
=== r0bby_ is now known as robbyoconnor | ||
=== wedgwood is now known as wedgwood_away | ||
=== bradm_ is now known as bradm | ||
=== bob2_ is now known as bob2 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!