Re: TopGit: How to retire obsolete topic branches?

2009-05-07 Thread Manoj Srivastava
test--init-static-variables test--tls-fix topic--debian topic--pkg-config upstream Sometimes, just a sane convention is enough. manoj -- The primary function of the design engineer is to make things difficult for the fabricator and impossible for the serviceman. Manoj

Re: Dealing with autotools

2009-04-15 Thread Manoj Srivastava
do not fear computers... I fear the lack of them. Isaac Asimov Manoj Srivastava sriva...@acm.org http://www.golden-gryphon.com/ 1024D/BF24424C print 4966 F272 D093 B493 410B 924B 21BA DABB BF24 424C ___ vcs-pkg-discuss mailing list vcs-pkg-discuss

Detailing my workflow

2009-02-25 Thread Manoj Srivastava
who looks forward to marriage. A pessimist is a married optimist. Manoj Srivastava sriva...@acm.org http://www.golden-gryphon.com/ 1024D/BF24424C print 4966 F272 D093 B493 410B 924B 21BA DABB BF24 424C ___ vcs-pkg-discuss mailing list vcs-pkg-discuss

Re: Debian packaging with git and conflicts resolution

2008-11-22 Thread Manoj Srivastava
On Thu, Nov 20 2008, Sam Vilain wrote: On Thu, 2008-11-20 at 12:56 -0600, Manoj Srivastava wrote: Manoj, could you detail a particular scenario where you had conflicts between the topic branches ? Sure. Back when I was still the sole maintainer of refpolicy, I had a branch where

Re: Debian packaging with git and conflicts resolution

2008-11-20 Thread Manoj Srivastava
it. Schulz Manoj Srivastava [EMAIL PROTECTED] http://www.golden-gryphon.com/ 1024D/BF24424C print 4966 F272 D093 B493 410B 924B 21BA DABB BF24 424C ___ vcs-pkg-discuss mailing list vcs-pkg-discuss@lists.alioth.debian.org http://lists.alioth.debian.org

Re: Debian packaging with git and conflicts resolution

2008-11-18 Thread Manoj Srivastava
On Tue, Nov 18 2008, Nicolas Duboc wrote: On Mon, Nov 17, 2008 at 03:56:06PM -0800, Russ Allbery wrote: Manoj Srivastava [EMAIL PROTECTED] writes: Well, I have seen this happen. a) update the upstream branch (merge from remote/upstream, or git_load_dirs). b) Merge

Re: Debian packaging with git and conflicts resolution

2008-11-17 Thread Manoj Srivastava
. Do any other integration changes, and commit. d) Build from integration branch. I think this has become the standard operating procedure for me now. manoj -- Under consideration: We never heard of it. Kelvin Throop III, The Management Dictionary Manoj Srivastava [EMAIL

Re: commit IDs in changelog messsages

2008-11-16 Thread Manoj Srivastava
On Sat, Nov 15 2008, martin f krafft wrote: also sprach Manoj Srivastava [EMAIL PROTECTED] [2008.11.14.0719 +0100]: f) edit ./debian/changelog, adding in any additional language. I generally keep my commit messages and changlog entries distinct, since commit messages explain

Re: commit IDs in changelog messsages

2008-11-16 Thread Manoj Srivastava
. developers are the consumers of the commit log. manoj -- Air pollution is really making us pay through the nose. Manoj Srivastava [EMAIL PROTECTED] http://www.golden-gryphon.com/ 1024D/BF24424C print 4966 F272 D093 B493 410B 924B 21BA DABB BF24 424C

Re: debian/topics and conflict resolution

2008-10-06 Thread Manoj Srivastava
On Mon, Oct 06 2008, martin f krafft wrote: also sprach Manoj Srivastava [EMAIL PROTECTED] [2008.10.04.0735 +0200]: Right. The diff.gz is what the buildd's are fed, each of the patchsets in ./debian/topic recreate exactly the feature branches used to develop the code

Re: the goal of vcs-pkg

2008-10-06 Thread Manoj Srivastava
On Mon, Oct 06 2008, martin f krafft wrote: also sprach Manoj Srivastava [EMAIL PROTECTED] [2008.10.02.2006 +0200]: Now suppose you have your _own_ heirarchy of debian directories. You can just change the submodule location, which is only referred to in the build branch

Re: debian/topics and conflict resolution

2008-10-06 Thread Manoj Srivastava
Hi, Perhaps I should wait after drinkina high sugar content drink before posting. On Mon, Oct 06 2008, Manoj Srivastava wrote: On Mon, Oct 06 2008, martin f krafft wrote: also sprach Manoj Srivastava [EMAIL PROTECTED] [2008.10.04.0735 +0200]: Right. The diff.gz is what

Re: extracting patches from the ancestry graph

2008-10-01 Thread Manoj Srivastava
. If the integration branch is published, even casual browsers of code can see what the package did. manoj -- A man is not complete until he is married -- then he is finished. Manoj Srivastava [EMAIL PROTECTED] http://www.golden-gryphon.com/ 1024D/BF24424C print 4966 F272 D093 B493 410B 924B

Re: extracting patches from the ancestry graph

2008-10-01 Thread Manoj Srivastava
On Wed, Oct 01 2008, George Danchev wrote: Quoting Manoj Srivastava [EMAIL PROTECTED]: On Wed, Oct 01 2008, martin f krafft wrote: Assuming we have a number of feature branches, we may well have to resolve conflicts among them, so an integration branch seems like the right way forward. So

Re: Introductory mail

2008-09-29 Thread Manoj Srivastava
On Mon, Sep 29 2008, martin f krafft wrote: also sprach Manoj Srivastava [EMAIL PROTECTED] [2008.09.29.1908 +0200]: My goal is not to have a patch series in a Debian package. My goal is to be able to develop software that is packaged for Debian -- This argument has been taken ad infinitum