=== thumper_ is now known as _thumper_ [00:47] I'm new to bazaar, just wondering if it is possible to create such a bzr server: [00:47] 1. It branches a launchpad project [00:47] 2. It pulls from launchpad regularly (every midnight) [00:47] 3. I pull from this bzr server, and I can commit changes to this server [00:47] 4. If required, I can resolve conflicts on this server manually === bsd1 is now known as bsd === _thumper_ is now known as vorpalbunny === slank is now known as slank_away === Guest19155 is now known as LoganCloud === vorpalbunny is now known as thumper === yofel_ is now known as yofel === slank_away is now known as slank [17:16] how do i change `bzr revert -r2` to only revert r2 rather than r2..-1 [17:18] JPeterson: bzr merge -r2..1 [17:18] it's a "reverse merge" of the revision that you don't want, so will remove the changes from that revision, but not others === deryck is now known as deryck[lunch] [17:57] james_w: it returns many (599 conflicts). can i avoid that? [18:02] james_w: i rectract that stement, i specified the wrong revision range [18:12] how do i change `bzr git-apply -`to read from stdin? [19:13] JPeterson: see cmds.py in the bzr-git source [19:13] JPeterson: but please note that bzr git-apply is experimental and e.g. doesn't handle new files or renames [19:14] jelmer: there's no such file http://bazaar.launchpad.net/~bzr-git/bzr-git/trunk/files [19:16] jelmer: do you mean http://bazaar.launchpad.net/~bzr-git/bzr-git/trunk/view/head:/commands.py ? [19:16] i dont see the answer [19:16] explain the answert === deryck[lunch] is now known as deryck [20:29] jelmer, i haven't received a reply to the question if bzr git-apply can read from stdin === nopf is now known as elenium === elenium is now known as nopf [21:06] JPeterson: Yeah, commands.py [21:06] jelmer: row? [21:07] JPeterson: in cmd_git_apply, the run method [21:09] jelmer: row? [21:09] do you mean http://bazaar.launchpad.net/~bzr-git/bzr-git/trunk/view/head:/commands.py#L292 ? [21:10] is it `bzr git-apply sys.stdin`? [21:11] thet return [21:11] bzr: ERROR: [Errno 2] No such file or directory: u'sys.stdin' [21:13] jelmer: message fot you [21:16] open(sys.stdin, 'r') return [21:16] TypeError: coercing to Unicode: need string or buffer, file found [21:19] it seems like the answer to [21:19] [19:12] how do i change `bzr git-apply -`to read from stdin? [21:19] is no === SamB_ is now known as SamB