[02:55] <wenshan> hi guys, I have a local clone of a launchpad repository (not mine) and I have committed a few changes (so the revno has been increased), now if I want to pull in the changes from launchpad, what should I do to keep the history log clean? (something `git pull --rebase' equivalent)
[02:58] <thumper> my question is why you want the history log clean?
[02:58] <thumper> I'd go "bzr merge :parent"
[02:59] <thumper> someone did write a bzr rebase
[02:59] <thumper> but as a whole, most bzr users don't rebase
[02:59] <thumper> but merge instead
[03:03] <wenshan> because git uses hash string whereas bzr uses cumulative numbers, and it would be confusing (at least for me) to have different revision numbers for the same commits between my clone and the upstream.
[03:04] <wenshan> but anyway, I'd like to follow the bzr convention, will give 'bzr merge :parent' a go, thanks
[03:37] <wenshan> thumper: I did `bzr uncommit' to roll back to an older revision, and committed a few changes, then I did `bzr merge :parent', however, it returned "Nothing to do". What does `bzr merge :parent' do?
[03:39] <thumper> it depends where :parent is set
[03:39] <thumper> it defaults to the branch you branched from
[03:39] <thumper> bzr info shows at the end what the parent is
[03:39] <thumper> bzr merge <other branch> works too
[03:40] <thumper> if you have uncommitted going back to the last revision of the parent branch
[03:40] <thumper> you can just go "bzr pull"
[03:40] <thumper> instead of merge
[03:40]  * thumper hopes jam explains some here
[03:47] <wenshan> thumper: thanks
=== echo-are` is now known as echo-area
=== thumper is now known as thumper-afk
[14:19] <mgz> jam, jelmer: did either of you have a bash thingy for displaying the name of the current native colo branch in the prompt?
[14:22] <jelmer> mgz: I think somebody did, can't remember who though
[14:22] <mgz> what's the file you'd poke to get the current active branch name?
[14:23] <mgz> just .bzr/branch/location plus some processing I guess
[14:23] <jelmer> parse .bzr/branch/location IIRC
[14:23] <mgz> ace, thanks jelmer!
[14:24] <jelmer> mgz: y/w :-)
[17:20] <frusen> hi, my friend uses bzr on windows but gets this error: File "paramiko\transport.pyo", line 1633, in _check_banner SSHException: Error reading SSH protocol banner
[17:20] <frusen> 2.5.1 standalone version
[17:21] <frusen> we are working on the same bzr repository and everything works for me (on gnu/linux) so i figure it's not the servers fault
[17:21] <frusen> anyone have any experience with this error?
[17:30] <frusen> version 2.4.2 fixed it
=== lifeless_ is now known as lifeless