From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Arik Mitschang Newsgroups: gmane.emacs.devel Subject: pcvs branch and merge functions Date: Sun, 11 Jul 2010 13:45:13 -0400 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 X-Trace: dough.gmane.org 1278898588 18973 80.91.229.12 (12 Jul 2010 01:36:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 12 Jul 2010 01:36:28 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jul 12 03:36:27 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OY7wW-0004NT-Pc for ged-emacs-devel@m.gmane.org; Mon, 12 Jul 2010 03:36:25 +0200 Original-Received: from localhost ([127.0.0.1]:41206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OY7wV-0006bE-Kj for ged-emacs-devel@m.gmane.org; Sun, 11 Jul 2010 21:36:23 -0400 Original-Received: from [140.186.70.92] (port=43749 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OY0aZ-0002Oa-9l for emacs-devel@gnu.org; Sun, 11 Jul 2010 13:45:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OY0aY-0003Vi-5l for emacs-devel@gnu.org; Sun, 11 Jul 2010 13:45:15 -0400 Original-Received: from mail-gx0-f169.google.com ([209.85.161.169]:45922) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OY0aY-0003Vd-2u for emacs-devel@gnu.org; Sun, 11 Jul 2010 13:45:14 -0400 Original-Received: by gxk4 with SMTP id 4so2825610gxk.0 for ; Sun, 11 Jul 2010 10:45:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:content-type; bh=YAAq/4QFW2xA4I02FoqnWXDu+/qLaNS37ea8GeLPyH0=; b=WbXmZ3YXf7UhInBM2H2S3Bn+XW1Fu8KVVsl1jrDZ3ziHoQarnSGBM3+Y2qmm8UX9zg 5Wjq0+yBbNPWYcanBcYOvBobY9CKj0aYI6IZLqPigDW/BESuAhlXcUCsrnu6K+JDqm8k hf9qifn9fFPXdyoEuIOoTSWfJ4+c8HYkuV5yE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=oUGwlBY+Yw/jD1VnC69JKRfI1frX24fGYOK6vdivGHhtne76HsCebm4X2oS77JFf2d VMpTaT/aLYRFUhBht7DD0s6kj2ZKupzqwLvWmeeXmdjqzAlmi1H5hBDaQNr3ZayiWWpq RWIkyudhkok27Se6oMsPAYEajPhKHwsVwuuUY= Original-Received: by 10.150.218.18 with SMTP id q18mr4551075ybg.66.1278870313056; Sun, 11 Jul 2010 10:45:13 -0700 (PDT) Original-Received: by 10.150.157.2 with HTTP; Sun, 11 Jul 2010 10:45:13 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Mailman-Approved-At: Sun, 11 Jul 2010 21:36:16 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:127078 Archived-At: Hi emacs-dev, I propose adding the branch and merge functionality that I have added to pcvs, which can be viewed with 'bzr branch lp:~akwm/emacs/pcvs-branch-and-merge'. It simplifies creating a branch for CVS through tagging and allows to add a base/branch postfix such as branch-name{-BASE} and branch-name{-BRANCH} to the base point and branch. After creating the branch the cvs dir is then moved onto it (seems desired). The merge function will then take a branch-name and (if needed) add the appropriate postfix to do the joining. At present, this functionality can be achieved but through many tag prefix args which (I find) are easy to loose track of. More could be added to this for convenience but these lay a groundwork for branching and merging in CVS development in emacs. Any thoughts? I am a new member so I think I need some sort of sponsor to add this to mainline development. Thanks for the time, ~Arik