| igc | morning | 02:42 |
|---|---|---|
| boscop_ | how can I change the language of tortoisebzr? | 03:32 |
| PacoBuntu | Hello, can someone help me please i just installed bazaar to download some sourcecode from launchpad, but i don't know where it download it to? | 03:41 |
| === NEBAP|work3 is now known as NEBAP | ||
| === NEBAP is now known as NEBAP|work | ||
| johnf | What is the best way to work out if my parent branch has new revisions? | 08:37 |
| johnf | bzr missing looks like what I need | 08:40 |
| johnf | does anyone else think it's a bug that bzr missing returns 1 if there are missing revisions? | 08:40 |
| bob2 | I think it's deliberate | 08:47 |
| abli | Hi! how can I set up an lp-style repository shortcut for some other repository? I.e. to allow checkout /branch with "bzr checkout myprefix:branchname"? | 09:47 |
| NEBAP|work | is it possible to ignore a folder in bazaar? | 10:40 |
| NEBAP|work | I´ve ignored some binary files which are created in a folder called "bin". Bazaar ignores those files correctly, but always stores the empty "bin" order which I won´t have in the repository ... | 10:42 |
| NEBAP|work | s/order/folder | 10:43 |
| jpds | bzr ignore bin | 10:44 |
| NEBAP|work | ah ok cool :) | 10:44 |
| NEBAP|work | does it ignore all "bin" folders then? | 10:45 |
| NEBAP|work | or just the bin folder in the root? | 10:45 |
| jpds | Just ./bin I think. | 10:45 |
| NEBAP|work | k | 10:45 |
| NEBAP|work | thank you | 10:46 |
| jpds | NEBAP|work: You can check by doing: bzr ignored. | 10:48 |
| NEBAP|work | ah ok, cool :) thanks | 10:48 |
| Mez | is there any easy way that I can setup my system so we have a local bzr repo that mirror's itself out to a remote host automagically. | 11:07 |
| NEBAP|work | Mez: afaik it´s possible if you use "bzr checkout" to get the remote host | 11:09 |
| NEBAP|work | after that each "bzr commit" will commit remote and after success to local repo .. | 11:10 |
| === krisfree is now known as krisfremen | ||
| Mez | NEBAP|work: that didn't answer my question. We currently checkout from remote. We want to checkout from local, but have that push up to remote automagically. | 11:19 |
| NEBAP|work | Mez: afaik you can bind a branch to a remote brunch. For that I think it´s necessary to make "bzr push" to the remote location and then a "bzr bind" to the remote location. If a branch is bound to another one (like after using checkout) it will always first commit to the remote location and after success to the local location | 11:21 |
| NEBAP|work | hope this will help .. | 11:22 |
| NEBAP|work | sadly I´m just a bazaar beginner ... | 11:23 |
| Mez | NEBAP|work: I'm not | 11:23 |
| NEBAP|work | ^^ | 11:23 |
| NEBAP|work | is "bzr bind" what you looking for? | 11:23 |
| Mez | probably nor. | 11:24 |
| Mez | not * | 11:24 |
| Mez | I want to bind to a branch and have that bound to something else, if that makes sense | 11:24 |
| NEBAP|work | ah ok | 11:24 |
| NEBAP|work | no idea if that will work .. | 11:25 |
| Mez | that's what testing is for | 11:25 |
| NEBAP|work | yeah :) | 11:25 |
| Mez | apparently not :( | 11:27 |
| joschan | Sorry I am really blind or making some stupiod mistake. What is wrong about "bzr mv .\*.txt .\newdir"? | 11:27 |
| Mez | joschan: windows? | 11:28 |
| joschan | keeps telling me *.txt is not versioned but there are many *.txt files | 11:28 |
| joschan | windwos yes | 11:28 |
| Mez | joschan: you need to add the txt files | 11:28 |
| Mez | bzr add *.txt | 11:28 |
| joschan | Mez I add them again? | 11:29 |
| Mez | joschan: if it's saying they're not versioned, then you need to add them | 11:29 |
| Mez | or do a checkin before you move them I think | 11:29 |
| joschan | let me try | 11:29 |
| joschan | The issue here seems to be that the wildcard does not seem to work when mving. When I move the files single without wildcards it does not complain. They are all checked in and commited. | 11:31 |
| joschan | there is only a short info on http://doc.bazaar-vcs.org/bzr.dev/en/user-reference/bzr_man.html#mv - where is the full doc of mv? | 11:38 |
| joschan | I removed the .bzr dir and started a new archive with the correct file locations for now. Thank you! | 11:50 |
| joschan | (if you have any suggestion I am still in the room but it is no longer urgent) | 11:51 |
| bob2 | joschan: what's with the back slashes? | 12:49 |
| abli | Hi! how can I set up an lp-style repository shortcut for some other repository? I.e. to allow checkout /branch with "bzr checkout myprefix:branchname"? | 12:52 |
| luks | if you don't mind "bzr checkout bm:myprefix/branchname" you can use the bzr-bookmarks plugin | 12:53 |
| LarstiQ | if you do, you could write a directory service provider for myprefix: | 12:54 |
| LarstiQ | luks: could the bookmarks plugin maybe support that? | 12:55 |
| Peng_ | The lp: directory service is provided by a built-in plugin, in bzrlib/plugins/launchpad/. | 12:55 |
| Peng_ | You could write your own plugin if you wanted to. | 12:55 |
| luks | LarstiQ: maybe, but I don't like that, so I'm not going to implement that :) | 12:55 |
| LarstiQ | luks: ok :) | 12:55 |
| luks | but I'm not going to stop anybody else :) | 12:56 |
| abli | Thanks, guys! | 12:56 |
| === sidnei_ is now known as sidnei | ||
| joschan | bob2: I tried both slashes / and \ both the same | 13:23 |
| joschan | do you think it needs escaping? | 13:23 |
| bob2 | joschan: it needs to not be escaped | 13:24 |
| joschan | but slashes and wildcards work when I "add" | 13:24 |
| joschan | but not when i move | 13:24 |
| joschan | i just tried adding something with wildcards and slahes and it works | 13:24 |
| joschan | maybe my python and bzr is too old - i will just wait until i upgrade this machine the next time | 13:25 |
| joschan | bzr uses the python installed on this windows machine, does it? | 13:25 |
| Peng_ | joschan: Depends on how you installed it. | 13:26 |
| bob2 | are they really dot files? | 13:26 |
| bob2 | I would be unsurprised if windows puked on that | 13:26 |
| Peng_ | joschan: "bzr version" will explain. | 13:26 |
| joschan | Peng_ ok it uses it's own python 2.5.2 and bzr is 1.12 | 13:26 |
| joschan | bob2 I will try again and use dotfiles | 13:27 |
| joschan | bob2: i made another add with a dotfile, with wildcard and slash and it works | 13:28 |
| bob2 | craaaaazy | 13:29 |
| === nevans1 is now known as nevans | ||
| === AfC1 is now known as AfC | ||
| boscop_ | how do I setup bazaar on my server so that I have a private repo? | 16:02 |
| Peng_ | boscop_: Set the file permissions so it's not world-readable? | 16:02 |
| Peng_ | boscop_: If you mean the smart server (bzr://, etc.), it does no auth itself; it leaves that to sshd, the web server, etc. | 16:03 |
| boscop_ | Peng_, can I have different users that have passwords, etc? | 16:03 |
| xnox | I've screwed up a rebase (it did everything correct but it's not what I wanted) how do I get back where I started? | 16:03 |
| SamB | xnox: it didn't tell you what the old commit was ? | 16:10 |
| SamB | well ... "bzr heads" could be helpful | 16:12 |
| SamB | (from the bzrtools plugin) | 16:12 |
| === Kissaki^0ff is now known as Kissaki | ||
| === boscop_ is now known as boscop | ||
| LarstiQ | verterok: have you seen http://javierder.wordpress.com/2009/05/19/bzreclipse-unofficial-release/ ? | 20:48 |
| Pegasus_RPG | hello | 21:24 |
| Pegasus_RPG | We're using BZR on Launchpad and have created a release branch from our vcs-imports/trunk branch | 21:25 |
| Pegasus_RPG | now we've merged vcs-imports with the main lp trunk branch | 21:25 |
| LarstiQ | they share ancestry? | 21:26 |
| Pegasus_RPG | we'd now like to merge the changes from the release branch to the now-current trunk but keep the release branch for future bug fixes | 21:26 |
| Pegasus_RPG | LarstiQ: ultimately, yes | 21:26 |
| LarstiQ | Pegasus_RPG: ok | 21:26 |
| Pegasus_RPG | though bzr info doesn't suggest it | 21:26 |
| Pegasus_RPG | though looking at the histories, it appears that the release branch was branched from vcs-imports | 21:31 |
| Pegasus_RPG | though the revision numbers are off of course | 21:31 |
| Pegasus_RPG | so how do we go about merging the changes from the release branch to trunk without removing or changing the release branch? | 21:32 |
| Pegasus_RPG | (This might be a LP question as well...) | 21:32 |
| LarstiQ | cd trunk; bzr merge release; bzr ci | 21:36 |
| Pegasus_RPG | does that assume I have local branches of both, because I currently don't. | 21:37 |
| Pegasus_RPG | (I have a checkout of the release and nothing for the trunk yet) | 21:37 |
| LarstiQ | Pegasus_RPG: you need a working tree to perform a merge, but release need not be local | 21:38 |
| LarstiQ | Pegasus_RPG: so yeah, you'll need to get a local trunk to work with | 21:38 |
| Pegasus_RPG | so for the "bzr merge release" command, "release" could just be the URL to the server directly as well as the local dir (regardless of whether that's a checkout or a branch?) | 21:39 |
| LarstiQ | Pegasus_RPG: yes | 21:39 |
| Pegasus_RPG | ok...what's bzr ci? | 21:40 |
| LarstiQ | Pegasus_RPG: shorthand for commit | 21:40 |
| Pegasus_RPG | ok | 21:40 |
| Pegasus_RPG | so that will leave the branch unaffected? | 21:40 |
| Pegasus_RPG | er the release branch/ | 21:40 |
| LarstiQ | it will only read from release, yes | 21:40 |
| Pegasus_RPG | awesome | 21:40 |
| Pegasus_RPG | thank you | 21:40 |
| LarstiQ | np :) | 21:40 |
| Pegasus_RPG | (My only question now is if LP will see that I merged the changes and mark bug statuses accordingly) | 21:41 |
| Pegasus_RPG | (And not mark the release branch merged. :) ) | 21:41 |
| LarstiQ | that is LP knowledge, which I don't have, sorry :) | 21:42 |
| LarstiQ | (or well, no knowledge of that specific part in current LP) | 21:42 |
| Pegasus_RPG | right...thanks though! :) | 21:42 |
| Pegasus_RPG | oh one other question, LarstiQ | 21:45 |
| Pegasus_RPG | I want to use kdiff3 if there are any conflicts but bzr extmerge complains of an unknown command | 21:45 |
| Pegasus_RPG | I'm on Debian testing | 21:45 |
| LarstiQ | `bzr diff --using=something-with-kdiff`? | 21:46 |
| Pegasus_RPG | hm | 21:47 |
| Pegasus_RPG | http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#resolving-conflicts | 21:48 |
| Pegasus_RPG | section 4.4.5 | 21:48 |
| Pegasus_RPG | sounds good but I don't know where or how to get that plugin | 21:48 |
| Pegasus_RPG | oh wait I found it | 21:49 |
| Pegasus_RPG | http://erik.bagfors.nu/bzr-plugins/extmerge/ | 21:49 |
| === Kissaki is now known as Kissaki^0ff | ||
| Pegasus_RPG | I'm doing a merge from a release branch back to trunk (bug fixes) and there's a file in the branch that isn't in trunk that I want to put there. What command would I use? | 22:57 |
| bob2 | if it was added in the branch, it will be merged into trunk by merge | 22:57 |
| Pegasus_RPG | it isn't | 22:58 |
| bob2 | was it added in the branch? | 22:58 |
| Pegasus_RPG | it just says <trunk path>/<filename> does not exist | 22:59 |
| Pegasus_RPG | I think so | 22:59 |
| bob2 | what says that? | 22:59 |
| Pegasus_RPG | oh crap, no | 22:59 |
| Pegasus_RPG | I see Mixxx.nsi.BASE Mixxx.nsi.OTHER in the trunk | 22:59 |
| Pegasus_RPG | and Mixxx.nsi in the branch | 22:59 |
| bob2 | sounds like it existed in both, and bzr tried to merge | 23:00 |
| Pegasus_RPG | yeah I think a new copy was written to the branch | 23:00 |
| Pegasus_RPG | So I just want that version | 23:00 |
| Pegasus_RPG | er no | 23:00 |
| Pegasus_RPG | there were some changes made to the trunk version as well IIRC | 23:01 |
| Pegasus_RPG | so how do I resolve this without messing up the accounting of the file? | 23:01 |
| bob2 | how do you want to resolve it? | 23:01 |
| Pegasus_RPG | using kdiff3 | 23:02 |
| bob2 | well, go for it | 23:02 |
| Pegasus_RPG | But I mean, will bzr see it as a new file if I just drop it in trunk? | 23:02 |
| Pegasus_RPG | and lose the history? | 23:02 |
| bob2 | when foo.bar is how you want it, 'bzr resolve foo.bar', 'bzr status' to make sure the merge looks ok, then commit | 23:02 |
| bob2 | what | 23:02 |
| Pegasus_RPG | like, right now, trunk doesn't have the file at all, just the .BASE and .OTHER ones | 23:03 |
| bob2 | to resolve a conflict, put whatever you want the resolution to be in 'foo.bar', then 'bzr resolve foo.bar' | 23:03 |
| Pegasus_RPG | that'll keep the commit history from the branch? | 23:03 |
| Pegasus_RPG | (I don't need to do like a bzr copy or something?) | 23:03 |
| bob2 | yes, no | 23:04 |
| Pegasus_RPG | ok cool. thanks | 23:04 |
| bob2 | just make sure it all looks ok with 'bzr status' before committing | 23:04 |
| cyberixae | I merged a branch which removes directories. | 23:06 |
| cyberixae | I had some binaries from builds left in those directories. | 23:06 |
| cyberixae | and I got a conflict because the directories weren't empty after removing the revisioned files | 23:06 |
| cyberixae | No matter what I do bzr tells me that the directories cannot be moved because they aren't empty | 23:08 |
| cyberixae | even, if I remove them or empty them | 23:08 |
| cyberixae | and say "bzr resolve" after that | 23:08 |
| bob2 | delete them, 'bzr resolve', check 'bzr status' | 23:08 |
| cyberixae | I deleted the directory | 23:10 |
| cyberixae | cyberix@eval:/tmp/winehack/src$ bzr resolve | 23:10 |
| cyberixae | 0 conflict(s) auto-resolved. | 23:10 |
| cyberixae | Remaining conflicts: | 23:10 |
| cyberixae | Conflict: can't delete src/Listener because it is not empty. Not deleting. | 23:10 |
| cyberixae | Text conflict in src/lib/Sample.c | 23:10 |
| cyberixae | Even, when the directory Listener does not exist | 23:11 |
| bob2 | bzr resolve src/Listener? | 23:11 |
| g_s_g_s | hi all, newb question. In SVN, for personal software development I've used a "trunkless" development model, i.e. branches 1.0 -> 1.1 -> 1.2 etc with no need to use a trunk. Does this map onto bzr without problems? | 23:14 |
| bob2 | sure | 23:14 |
| bob2 | (few systems care what you call your branches) | 23:15 |
| g_s_g_s | ok, I'll give it a try | 23:16 |
| g_s_g_s | have just tried out Hg and have found the Eclipse plugin very immature so am looking at Bzr | 23:17 |
| bob2 | don't know what bzr's eclipse integration is like these days | 23:17 |
| g_s_g_s | I checked the bug list and it didn't look too bad in comparison | 23:18 |
| g_s_g_s | though still a fair way to go to reach svn levels | 23:19 |
| g_s_g_s | http://bitbucket.org/mercurialeclipse/main/issues/ vs https://bugs.launchpad.net/bzr-eclipse/+bugs | 23:20 |
| cyberixae | bob2: Thanks. That solved it. | 23:23 |
| bob2 | ah, cool | 23:23 |
| bob2 | it is a pain/bug that 'bzr resolve' didn't | 23:23 |
| zand3r | g_s_g_s: I'd be interested to know how you think it compares when you've tried the Bzr Eclipse plugin as that's something I'm going to be looking at imminently. | 23:28 |
| g_s_g_s | well the Hg/Eclipse is unusable for me coz it takes 30 secs to start http://bitbucket.org/mercurialeclipse/main/issue/156/eclipse-startup-error-checking-if-mercurial-is-correctly | 23:29 |
| g_s_g_s | so anything is better than that | 23:30 |
| g_s_g_s | however that problem I suspect may be due to an interaction between plugins, so as everyone has a differing set of plugins YMMV | 23:32 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!