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