| Wiz_KeeD | hey guys | 09:01 |
|---|---|---|
| Wiz_KeeD | how do i push a single file towards a repository, so I made multiple commits (3) and the last one changed file x that I would like to push alone | 09:02 |
| Wiz_KeeD | is that possible? | 09:02 |
| Peng | Cherrypicking and pushing one revision but not its ancestors? Not really. | 09:12 |
| Peng | Look up cherrypicking. You can do it, but you'd effectively be creating a new, otherwise-identical revision that's a child of -4. | 09:13 |
| Peng | .... unless this has been made easier recently. | 09:13 |
| Wiz_KeeD | I see what you are saying Peng, thought about that myself but figured there might be a way to avoid it | 09:28 |
| Wiz_KeeD | maybe I should keep the experimental commits on a separate branch from the production one where all the commits are "safe" | 09:28 |
| Peng | That sounds like a good idea. | 09:37 |
| Wiz_KeeD | though I've never done a merge in my life :)) | 09:40 |
| Peng | You should, it's fun. | 09:48 |
| Wiz_KeeD | mergin? i don't think so :)) especially on bit projects | 09:54 |
| cmars | hi | 19:36 |
| cmars | what does it mean when bzr says "Merging branch abc into xyz would be pointless"? | 19:36 |
| cmars | i am fairly certain that the branches do differ | 19:36 |
| cmars | nevermind, it was a tarmac issue | 19:41 |
| === thumper is now known as thumper-afk | ||
| === thumper-afk is now known as thumper | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!