bendj | I'm using -- or trying to -- bzr-eclipse with Eclipse35 (Galileo). I've created a new project by doing a Checkout (heavyweight) from a remote server to a local project. Works great. I then edit locally, and exec a commit. My understanding was that @ commit in this HW checkout, the changes are auto-pushed back to the original branch at the remote server. | 00:52 |
---|---|---|
bendj | It seems that that IS the case -- but I still need to do a 'bzr update' *AT* the server to see the pushed changes. | 00:53 |
bendj | Is that 'expected' behavior? | 00:53 |
fullermd | Yes. | 00:58 |
bendj | fullermd: Must reread the docs, then :-( Is there a brz command to execute at the local box to get that final update @ the server to occur? Or do I have to log in and do the update at the server? | 01:00 |
fullermd | Well, yes and no... | 01:00 |
lifeless | you can install the push-update plugin | 01:00 |
lifeless | the branch on the server gets the changes immediately you commit, its just the user content that isn't updated (because its hard to do well) | 01:01 |
fullermd | bzr doesn't deal with working trees remotely. The push-and-update (what lifeless said) turns 'push' into 'push ; ssh foo bzr up'. | 01:01 |
fullermd | So, it does log in and do the update at the server, just automatically. | 01:02 |
bendj | fullermd: lifeless Ok, have the plugin. Thanks. BUT, it's gonna NOT be available to the Eclipse plugin until it's integrated, right? For now, just available at cmd line ... or ? | 01:04 |
fullermd | I dunno. At one time I thought the Eclipse plugin called the CLI fairly remotely on the backend, in which case the push would DTRT there. | 01:05 |
fullermd | Though I don't remember if p-a-u ever actually integrated hooking into commit at all, now that I think of it, so it may not do what you want in a checkout anyway... | 01:06 |
fullermd | Dunno though. I remember it was discussed. | 01:06 |
bendj | fullermd: Ok, I'll look thru mail archives for it. Having the plugin installed doesn't seem to change anything in the eclipse interface :-/ | 01:10 |
fullermd | Basically, when you start talking about either one, you're way off my turf; I just know the right-sounding words to describe parts of it 8-} | 01:11 |
bendj | fullermd: Ah, you're in Marketing ;-p | 01:15 |
fullermd | I... oooh! Why, you... | 01:16 |
bendj | Coulda been worse ... Sales! | 01:16 |
bendj | Posted a question abt push-and-update integration into the Eclipse intfc at Launchpad. Thanks folks! | 01:22 |
AndrewLuecke | g'day, I hate to bug you guys again, but anyone else experienced really slow code browsing on their server? ie: http://develop.getnightingale.org/browser/nightingale | 06:06 |
AndrewLuecke | does it in loggerhead and trac.. | 06:07 |
MTecknology | I'm getting this error when I try to push a branch - bzr: ERROR: Server sent an unexpected error: ('error', 'mail is not installed !?') | 07:28 |
MTecknology | sendmail is installed on that server | 07:28 |
MTecknology | I also installed bzr-mail | 07:29 |
MTecknology | oh - bsd-mailx required too | 07:31 |
MAfifi | I've recently begun to use bzr(coming from mercurial background). I'd like to know if bzr has a command corresponding to mercurial's "hg update -r <rev>". | 15:34 |
MAfifi | I mean if I want to assess some functionality or bug in an old version... | 15:35 |
LarstiQ | MAfifi: not sure what hg update -r does exactly, but I'm guessing it's `bzr update -r` or `bzr revert -r` | 15:35 |
MAfifi | I've just tried; there's nothing as "bzr update -r ...". | 15:39 |
MAfifi | bzr revert -r seems to work however, it restores the status of the target revision to the working tree(causing dirty changes to the tree, but that isn't a big problem anyway). | 15:42 |
LarstiQ | MAfifi: what version of bzr is that? (Also, it helps if you prefix with my nick so irc highlights) | 15:50 |
jelmer | MAfifi: newer versions of bazaar have 'bzr update -r' | 15:50 |
LarstiQ | seems to be introduced in 2.1.0rc1 | 15:51 |
MAfifi | LarstiQ: I've version 2.0.0. | 16:18 |
LarstiQ | MAfifi: that explains it | 16:20 |
MAfifi | LarstiQ: So should I get a higher version? | 16:22 |
LarstiQ | MAfifi: personally I'm fine with `bzr revert -r revno; # check situation; bzr revert` to inspect and return to current state | 16:24 |
LarstiQ | MAfifi: but you can upgrade to 2.1.0 if you want, it's been out for 2 months now | 16:25 |
MAfifi | LarstiQ: Thanks, I found that in 2.1.0 rc1 release notes "bzr update now takes a --revision argument. This lets you change the revision of the working tree to any revision in the ancestry of the current or master branch. (Matthieu Moy, Mark Hammond, Martin Pool, #45719)" | 16:27 |
LarstiQ | MAfifi: yup :) | 16:28 |
BiosElement | Hmm, anyone hopefully know a solution to this bug? http://paste.ofcode.org/FMFft2e3Lb7JnGAMDyYWPf | 19:46 |
vila | BiosElement: it may be bug #375898 if you previously merged an external branch (unrelated at the time of the first merge) | 20:32 |
ubottu | Launchpad bug 375898 in bzr "bzr merge fails: bzr: ERROR: No final name for trans_id 'new-1'" [High,Fix released] https://launchpad.net/bugs/375898 | 20:32 |
BiosElement | Aye, that sounds like it vila. | 20:32 |
vila | BiosElement: or something else, the messages about the progress bars sound like a quite old version of bzr, try upgrading it first | 20:33 |
BiosElement | vila: if only it were that simple. It's bzr 2.1.1. | 20:34 |
vila | BiosElement: the fix for the bug above is not yet in any release (it will be soon), so you may need to use the branch associated with the bug | 20:34 |
BiosElement | Aye, I'm looking at compiling it for use. | 20:35 |
vila | BiosElement: I'm just passing around and it's late here, if you still have problems, try the mailing list or file a bug (if your branch is public, add the url) | 20:36 |
BiosElement | Aight, thanks vila. | 20:36 |
vila | or come back tomorrow :) | 20:36 |
BiosElement | Heh, aight | 20:36 |
lifeless | moin | 22:31 |
jelmer | 'morning lifeless | 22:36 |
jelmer | lifeless: I finally managed to get around to writing that per_bzrdir_color branch; was much easier than I expected, thanks for the hints. | 22:37 |
jelmer | *colo | 22:37 |
lifeless | jelmer: cool | 22:40 |
lifeless | thats really encouraging | 22:40 |
igc | morning | 23:33 |
igc | hi lifeless, jelmer | 23:34 |
jelmer | Hi Ian | 23:34 |
lifeless | hi igc | 23:36 |
lifeless | ugh | 23:58 |
lifeless | quick sanity check | 23:58 |
lifeless | > /usr/lib/python2.6/dist-packages/bzrlib/transport/local.py(484)stat() | 23:58 |
lifeless | that does a 'stat()' | 23:58 |
lifeless | not an 'lstat()' | 23:58 |
lifeless | is it just me or is that nuts ? | 23:58 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!