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

Axel Thimm Axel.Thimm at ATrpms.net
Sun Apr 22 21:03:02 CEST 2007


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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.lm-sensors.org/pipermail/lm-sensors/attachments/20070422/4bc9c613/attachment.bin 


More information about the lm-sensors mailing list