From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Martin Geisler Newsgroups: gmane.comp.version-control.mercurial.general,gmane.emacs.devel Subject: Re: Emacs Bazaar repository Date: Sat, 15 Mar 2008 22:32:04 +0100 Organization: http://mgeisler.net/ Message-ID: <871w6bk71n.fsf@hbox.dyndns.org> References: <87skyvse7k.fsf@xmission.com> <86ejae96t4.fsf@lola.quinscape.zz> <878x0lvt6e.fsf@hbox.dyndns.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0079444724==" X-Trace: ger.gmane.org 1205619291 23515 80.91.229.12 (15 Mar 2008 22:14:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Mar 2008 22:14:51 +0000 (UTC) Cc: emacs-devel@gnu.org To: mercurial@selenic.com Original-X-From: mercurial-bounces@selenic.com Sat Mar 15 23:15:18 2008 Return-path: Envelope-to: gcvmd-mercurial@gmane.org Original-Received: from waste.org ([66.93.16.53]) by lo.gmane.org with esmtp (Exim 4.50) id 1Jaees-00040M-8Y for gcvmd-mercurial@gmane.org; Sat, 15 Mar 2008 23:15:18 +0100 Original-Received: from waste.org (localhost [127.0.0.1]) by waste.org (8.13.8/8.13.8/Debian-3) with ESMTP id m2FMAUEG032446; Sat, 15 Mar 2008 17:10:41 -0500 Original-Received: from ciao.gmane.org (main.gmane.org [80.91.229.2]) by waste.org (8.13.8/8.13.8/Debian-3) with ESMTP id m2FMA9pt032422 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT) for ; Sat, 15 Mar 2008 17:10:19 -0500 Original-Received: from root by ciao.gmane.org with local (Exim 4.43) id 1JaeZm-00024z-A8 for mercurial@selenic.com; Sat, 15 Mar 2008 22:10:02 +0000 Original-Received: from 0x5550c157.adsl.cybercity.dk ([85.80.193.87]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 15 Mar 2008 22:10:02 +0000 Original-Received: from mg by 0x5550c157.adsl.cybercity.dk with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 15 Mar 2008 22:10:02 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Followup-To: gmane.comp.version-control.mercurial.general Original-Lines: 58 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 0x5550c157.adsl.cybercity.dk User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) Cancel-Lock: sha1:NjRkXGDEfW5g3y4rDnqR3JKnsnw= X-Virus-Scanned: by amavisd-new X-BeenThere: mercurial@selenic.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Mime-version: 1.0 Original-Sender: mercurial-bounces@selenic.com Errors-To: mercurial-bounces@selenic.com Xref: news.gmane.org gmane.comp.version-control.mercurial.general:6003 gmane.emacs.devel:92705 Archived-At: --===============0079444724== Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" --=-=-= Content-Transfer-Encoding: quoted-printable dhruva writes: > Hi, > > On Sat, Mar 15, 2008 at 3:56 AM, Martin Geisler wrote: >>dhruva writes: >>> Having tried a bunch of SCM, I must say GIT way of supporting >>> multiple branches under the same folder along with its speed it a >>> sure winner. I was opposing GIT due to its non-availability on M$, >>> it is history now and the port they have is really good. The build >>> is streamlined on M$ too, I pull their changes regularly, build, >>> install and use the bleeding edge. It has not failed me so far. >>> >>> If Mercurial had the ability to truly support multiple branches in >>> the same folder (with out requiring me to merge all branches before >>> I can pull - pull works only if there is a single tip/branch), I >>> would have preferred it mainly because it just needs PYTHON and >>> nothing else (GIT needs PERL and SHELL). >> >> I think you are confusing several 'heads' with several 'branches' >> here. And even if you have several heads in your Mercurial >> repository, you can certainly still pull in new changesets. > > I have seen it and have used it too. The problem comes (from my > experience) when you have to push. I agree you can create a new named > branch and just pull in changes or do a forced pull which will create > a new head. Suppose I want to keep multiple named branches active and > yet push to a remote repository from one of the named branch, IMO it > is not possible with mercurial. I would be happy to know if there is a > way to do it. I'm afraid I'm no expert on named branches in Mercurial, I just wanted to point out that pulling in changesets is a normal supported operation even when you have multiple heads. I've posted this to the Mercurial user list too since I think the question is much more suited for them to answer. =2D-=20 Martin Geisler VIFF (Virtual Ideal Functionality Framework) brings easy and efficient SMPC (Secure Multi-Party Computation) to Python. See: http://viff.dk/. --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFH3EBi6nfwy35F3TgRArMOAJ0epvlbdbh/6Ofamz/jKWzY7EXxNACfWpLT B4Oilc1dJ1EKQDYJQhWvuZA= =BGux -----END PGP SIGNATURE----- --=-=-=-- --===============0079444724== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline