[15:05] <tuvwx> where can i read/learn about how to use bzr with multiple, possibly divergent remote branches? what are my options? (no local changes)
[15:07] <tuvwx> i have a local branch from one remote branch. now i want changes from another remote branch. 'bzr missing <new-remote-branch' says: You have 3 extra revisions, and You are missing 65 revisions
[15:08] <tuvwx> how do i keep my 3 extra revisions and get the missing 65 revisions?
[15:09] <tuvwx> do i just 'merge <new-remote>', or is there a safer way?
[15:12] <jelmer> tuvwx: yeah, just 'bzr merge <new-remote>' should work
[15:12] <tuvwx> jelmer: and how do i recover if the merge goes bad? (go back to pre-merge state)
[15:13] <jelmer> tuvwx: 'bzr revert' will revert any pending changes in the working tree
[15:13] <tuvwx> the problem is: after the merge i will diverge from all remote branches. if i want to, how do i go back to being identical to one of them?
[15:14] <jelmer> tuvwx: you can 'bzr pull --overwrite <remote-branch>' to make your changes the same as the remote branch
[15:14] <tuvwx> jelmer: great! many thanks!
[15:15] <tuvwx> jelmer: btw, what is a good, compact source for such information? searching rarely lands me on breaf, to-the-point references
[15:15] <tuvwx> *brief
[15:16] <jelmer> tuvwx: http://doc.bazaar.canonical.com/bzr.2.5/en/tutorials/index.html might help
[15:17] <tuvwx> jelmer: see, i can't find --overwrite in there
[15:17] <jelmer> tuvwx: I don't think that's a very common thing; the docs on "bzr pull" will have some notes on overwrite I think
[15:19] <mgz> jelmer: (unrelated to anything) `bzr pull -d co:trunk` does surprising things
[15:19] <mgz> it's not at all like `bzr pull -d ../trunk` which is the anathingy I was expecting
[15:21] <tuvwx> i did the merge, and got no conflicts. how can i confirm that the working directory has code from the two source branches? version-info shows info for the original branch only
[15:21] <tuvwx> 'status' shows modified files (not committed yet)
[16:07] <tuvwx> i can't find any reference to the new branch after the merge
[17:00] <__marco> hello, how can I see if a pull will create collisions?
[17:05] <__marco> I have a big change that I decided to break in smaller pieces. I created a clone of my repo, made and committed some changes and now I would like to pull to my changes back
[17:05] <mgz> __marco: merge --preview
[17:07] <mgz> specifically, assuming branches original and new, `cd original; bzr merge --preview ../new`
[17:07] <__marco> mgz: now I now because it was not mentioned in the doc, no such option. my bazaar version is to old I think
[17:08] <mgz> just merge then diff then, but I suspect you just tyoped, preview has been in for ever
[17:08] <__marco> I am sorry, I read missing instead of merge
[17:09] <mgz> the relevent thing is what you are doing is a merge, not a pull.
[17:11] <__marco> mgz: a merge that is a pull because I made no changes in the original branch. So i looked only to the missing and pull documentation
[17:11] <__marco> and missed that
[17:11] <__marco> thanks
[17:24] <jelmer> mgz: doesn't it just pull the changes from the trunk colocated branch into the current branch?
[17:26] <mgz> jelmer: does something odd like switches the working tree... leaves the branch pointer alone, which is very confusing
[17:31] <xnox> is there a command line way to lookup sha1 of a given revno?
[17:32] <jelmer> xnox: I think "bzr revision-info" might show it
[17:32] <mgz> yeah
[17:32] <jelmer> xnox: otherwise there is "bzr cat-revision"
[17:33] <jelmer> xnox: but the output of that is format-specific, so it's not necessarily a good idea to use
[17:35] <xnox> jelmer: i'm after something like: get_testament_sha1(self, repo, revid):
[17:36] <jelmer> xnox: IIRC there was "bzr testament" as well
[17:38] <xnox> jelmer: now..... i just want testament locally to be the same as produced by udd =))))
[17:38]  * xnox is getting different sha values locally......
[17:38] <xnox> smells fishy
[17:39] <xnox> thansk a lot.
[19:42] <pindonga> hi... does anyone know of an easy way to get the timestamp for a given commit (by revno)
[19:42] <pindonga> using bzrlib
[19:45] <jelmer> pindonga: b = Branch.open(PATH); b.repository.get_revision(b.revision_id_to_revno(REVNO)).timestamp
[19:47] <pindonga> cool
[19:47] <pindonga> jelmer, if I do this: br.repository.get_revision(br.revision_id_to_revno(br.revno()))
[19:47] <pindonga> I get a NoSuchRevision error
[19:48] <pindonga> looks like it's not expecting a revno after all?
[19:48] <pindonga> I could use br.last_revision() instead
[19:48] <pindonga> but I'd like to use br.revno() as it's easier to read for humans (when I present the info)
[19:49] <jelmer> pindonga: sorry, br.get_rev_id() rather than br.revision_id_to_revno()
[19:49] <pindonga> ack
[19:49] <pindonga> thx
[21:39] <pindonga> jelmer, worked like a charm, thx!
[21:55] <jelmer> quicksilver: hi, did you hear back much in reply to your lazyweb post about activity trackers?