/srv/irclogs.ubuntu.com/2013/02/01/#bzr.txt

=== thumper_ is now known as _thumper_
Meatball_pyI'm new to bazaar, just wondering if it is possible to create such a bzr server:00:47
Meatball_py1. It branches a launchpad project00:47
Meatball_py2. It pulls from launchpad regularly (every midnight)00:47
Meatball_py3. I pull from this bzr server, and I can commit changes to this server00:47
Meatball_py4. If required, I can resolve conflicts on this server manually00:47
=== 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
JPetersonhow do i change `bzr revert -r2` to only revert r2 rather than r2..-117:16
james_wJPeterson: bzr merge -r2..117:18
james_wit's a "reverse merge" of the revision that you don't want, so will remove the changes from that revision, but not others17:18
=== deryck is now known as deryck[lunch]
JPetersonjames_w: it returns many (599 conflicts). can i avoid that?17:57
JPetersonjames_w: i rectract that stement, i specified the wrong revision range18:02
JPetersonhow do i change `bzr git-apply -`to read from stdin?18:12
jelmerJPeterson: see cmds.py in the bzr-git source19:13
jelmerJPeterson: but please note that bzr git-apply is experimental and e.g. doesn't handle new files or renames19:13
JPetersonjelmer: there's no such file http://bazaar.launchpad.net/~bzr-git/bzr-git/trunk/files19:14
JPetersonjelmer: do you mean http://bazaar.launchpad.net/~bzr-git/bzr-git/trunk/view/head:/commands.py ?19:16
JPetersoni dont see the answer19:16
JPetersonexplain the answert19:16
=== deryck[lunch] is now known as deryck
JPetersonjelmer, i haven't received a reply to the question if bzr git-apply can read from stdin20:29
=== nopf is now known as elenium
=== elenium is now known as nopf
jelmerJPeterson: Yeah, commands.py21:06
JPetersonjelmer: row?21:06
jelmerJPeterson: in cmd_git_apply, the run method21:07
JPetersonjelmer: row?21:09
JPetersondo you mean http://bazaar.launchpad.net/~bzr-git/bzr-git/trunk/view/head:/commands.py#L292 ?21:09
JPetersonis it `bzr git-apply sys.stdin`?21:10
JPetersonthet return21:11
JPetersonbzr: ERROR: [Errno 2] No such file or directory: u'sys.stdin'21:11
JPetersonjelmer: message fot you21:13
JPetersonopen(sys.stdin, 'r') return21:16
JPetersonTypeError: coercing to Unicode: need string or buffer, file found21:16
JPetersonit seems like the answer to21:19
JPeterson[19:12] <JPeterson> how do i change `bzr git-apply -`to read from stdin?21:19
JPetersonis no21:19
=== SamB_ is now known as SamB

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!