[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] using arch when commuting frequently between statio

From: Jan Hudec
Subject: Re: [Gnu-arch-users] using arch when commuting frequently between stations
Date: Sun, 7 Sep 2003 10:58:15 +0200
User-agent: Mutt/1.5.4i

On Sun, Sep 07, 2003 at 00:26:46 +0200, Denys Duchier wrote:
> Mark, thanks a lot for your illustrations.  They are really helpful
> and make things a lot clearer for me.  One part with which I have
> absolutely zero experience is: what happens when you want to commit a
> "clean" changeset into the "clean" branch?  How does one do that? Is
> that hard?  I can see that the working branches are going to be a
> little weird because the commits are not logical but merely dictated
> by whatever work you have been doing.  You probably don't want to use
> any specific changeset from the working branches.  Instead, you want
> to extract and rationalize "logical" changesets and apply them to the
> "clean" branch.  That's the part which I find most difficult to see
> how to accomplish.

On the work branch, you should always commit, when you finish a task. In
addition, you will have many transfer commits there, but it's important
that you commit at points, where you want the "clean" changesets. Then,
you just star-merge these to the "clean" branch. So each changeset on
the clean branch would contain several transfer commits and a commit
that finished a task.

When you work on several features in parallel, it's best to work on them
on separate branches.

                                                 Jan 'Bulb' Hudec 

reply via email to

[Prev in Thread] Current Thread [Next in Thread]