| Corey | Hmm. I have a checked out bazaar repo; how do I figure out what the upstream / origin / remote repo is? | 07:51 |
|---|---|---|
| fullermd | Check info. | 08:04 |
| lifeless | Corey: 'bzr info' | 08:08 |
| Corey | Thanks. | 08:12 |
| Corey | Much appreciated. | 08:12 |
| LeoNerd | If I have say, -r1 to -r100 on my trunk, then a branch adds a few more; then I make one more commit on the trunk, -r101 and replay that into the branch - Will a later rebase on the branch be able to cope with this, or will it get upset? | 12:02 |
| LeoNerd | I'm not sure I want to do the entire rebase operation -every- time I write a tiny oneline bugfix on trunk | 12:02 |
| gour | hello, curious what's new in bzr world...found the following http://stackoverflow.com/questions/8973636/what-problems-can-be-expected-with-bazaar-2-x-vcs where is says: "As of January 2012 you may observe the following restrictions...With bzr you'll be forced to use mainline concept of the history. I.e. the left-hand parent of the revision is special and forms mainline of your history, while your merged | 12:14 |
| gour | revisions make merged history. " is it really something new 'cause i believe it was present in bzr for quite some time, if not even from the beginning (by design) ? | 12:14 |
| LeoNerd | Pretty sure that's always been the case | 12:20 |
| LeoNerd | The lefthand parent is the one that is chosen as "canonical", for such purposes as numbering revisions | 12:20 |
| LeoNerd | So if -r100 is a merge revision, we know which one is -r99 vs which is the various parts of 100.1, 100.2, etc.. | 12:20 |
| === yofel_ is now known as yofel | ||
| gour | LeoNerd: yeah, i've the same opinion...but wonder why experienced bzr user says: "as of jan 2012..:" | 13:55 |
| gour | has something changed in regard to th points mentioned in http://zakalwe.fi/~shd/articles/why_not_bazaar.html ? | 13:56 |
| gour | e.g. 2.1? | 13:59 |
| gour | bzr docs (http://doc.bazaar.canonical.com/migration/en/why-switch-to-bazaar.html#rename-tracking-and-smart-merging) says: "Rename Tracking and Smart Merging" while http://zakalwe.fi/~shd/articles/why_not_bazaar.html says "Bazaar's Merge Algorithm Is Incomplete" what is true today? | 14:56 |
| littlegirl | Hey there, I noticed an error in the Bazaar 2.6.0 User Guide. Is this a good place to mention it? | 16:51 |
| littlegirl | In the event that it is, the guide mentions the use of bzr add and bzr remove when it should be bzr add and bzr revert. An example is here: http://paste.kde.org/496202/ | 16:54 |
| littlegirl | Scratch that. I just did bzr version and I'm not even using 2.6.0, so for all I know it works. (: | 16:55 |
| gour | bzr-git fails on github repo with "AttributeError: 'RemoteGitRepository' object has no attribute '_transport'" ? | 17:32 |
| gour | ahh..false alarm...i had some obsolete version of the plugin in ~/.bazaar | 17:52 |
| jelmer | gour: that has never been true | 20:11 |
| jelmer | gour: that article is very ignorant | 20:11 |
| jelmer | gour: bazaar has supported merging trees without common ancestors since its early days | 20:11 |
| gour | jelmer:hmmm...it would be good to have some "counter-article" refuting that one...btw, congrats for bzr-git...i did import some repos today and it is quite speedy ;) | 20:27 |
| gour | jelmer: what about this info: "As of January 2012 you may observe the following restrictions..." (1st answer http://stackoverflow.com/questions/8973636/what-problems-can-be-expected-with-bazaar-2-x-vcs) ? | 20:28 |
| jelmer | gour: You're welcome to write a counter-article; I'm not sure if responding to all the nonsense on the internet is particularly useful... | 20:33 |
| jelmer | gour: those 3 restrictions are still present | 20:36 |
| gour | jelmer: excuse me...we had power outage here | 20:36 |
| gour | jelmer: but that's not something new | 20:36 |
| jelmer | 22:33 < jelmer> gour: You're welcome to write a counter-article; I'm not sure if responding to all the nonsense on the internet is particularly useful... | 20:37 |
| jelmer | 22:36 < jelmer> gour: those 3 restrictions are still present | 20:37 |
| gour | :-) | 20:38 |
| lifeless | jelmer: gour: http://xkcd.com/386/ | 20:40 |
| gour | lol | 20:40 |
| jelmer | lifeless: :) | 20:41 |
| gour | is there some roadmap for bzr after 2.6? | 20:44 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!