=== wedgwood is now known as wedgwood_away | ||
=== mmrazik is now known as mmrazik|lunch | ||
=== mmrazik|lunch is now known as mmrazik | ||
=== wedgwood_away is now known as wedgwood | ||
=== mmrazik is now known as mmrazik|afk | ||
hypnocat | i deleted some lines in a certain file and checked the changes in a number of revisions ago... now i'd like to restore those same lines to the same file... how can i do that? | 16:14 |
---|---|---|
LeoNerd | You could reverse-merge that one file | 16:14 |
hypnocat | where can i read about how to do that? | 16:14 |
LeoNerd | bzr help merge | 16:15 |
hypnocat | thanks | 16:15 |
LeoNerd | Specifically something like bzr merge -r 20..19 . path/to/file | 16:15 |
LeoNerd | If the commit was -r20 | 16:15 |
hypnocat | i see | 16:16 |
hypnocat | what is the . there for? | 16:16 |
LeoNerd | Because you're mergeing from the current branch | 16:17 |
LeoNerd | bzr merge [OPTIONS...] BRANCH [FILES...] | 16:17 |
hypnocat | ah | 16:17 |
hypnocat | thank you | 16:17 |
hypnocat | hmm | 16:20 |
hypnocat | % bzr merge -r 976..975 . foo | 16:20 |
hypnocat | bzr: ERROR: extra argument to command merge: foo | 16:20 |
LeoNerd | Oh, hang on maybe I'm thinking of a different one | 16:33 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!