Re: [lm-sensors] Checking out and comitting to the libsensors-3.x

[Axel Thimm <Axel.Thimm@ATrpms.net>]

[-- Attachment #1.1: Type: text/plain, Size: 1145 bytes --]

Hi,

On Sun, Apr 08, 2007 at 07:40:30PM +0200, Jean Delvare wrote:
> > But you do get a marker for copies or merges that you can follow to
> > fork off A's history into B's.
> 
> True, but that's hardly convenient if merges are frequent and/or if the
> number of branches is important. I start understanding why people
> working with many branches don't even consider Subversion.

Well, git was written with merges as the first priority, as the kernel
is being cloned and developed as several places
simultaneously. mercurial has also better merge support.

I just stumbled over the following (which is why I'm replying to this
old mail):

http://subversion.tigris.org/merge-tracking/
http://www.orcaware.com/svn/wiki/Svnmerge.py

E.g. svn will one day have the support you need, but you need it
today. :(

(and I wouldn't recommend using the semi-official svnmerge.py, because
the official implemenation may look different and we'd be stuck with
broken upgrade paths - better to switch to git/mercurial if the need
becomes larger - mercurial works under trac, too, and git is about to)
-- 
Axel.Thimm at ATrpms.net

[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors