From: Theodore Tso <tytso@mit•edu>
To: Jakub Narebski <jnareb@gmail•com>
Cc: git@vger•kernel.org, "Eric S. Raymond" <esr@thyrsus•com>
Subject: Re: Comments on "Understanding Version Control" by Eric S. Raymond
Date: Thu, 5 Feb 2009 16:45:36 -0500 [thread overview]
Message-ID: <20090205214536.GB9814@mit.edu> (raw)
In-Reply-To: <200902051836.44973.jnareb@gmail.com>
On Thu, Feb 05, 2009 at 06:36:42PM +0100, Jakub Narebski wrote:
> What I wonder is how directory-id solution deals with situation
> where (for example die to some reorganization) where once was single
> directory (e.g. lib/) now there are two (include/ and src/); how it
> would deal with the new file at old directory, hmmm...?
In that case, it wouldn't be a directory rename, it would be a series
of file moves. So in a hypothetical scm that recorded all of these
sorts of things, you'd have something like this:
scm mv lib/*.c src
scm mv lib/*.h include
scm rmdir lib
Now if you try merging in a commit that creates a files in lib (e.g.,
creates lib/foo.c and lib/foo.h and modifies lib/Makefile), presumably
either a super smart hueristic algorith might be able to figure out
the pattern and drop the new files in src and include --- or, more
likely, it would flag a merge conflict and ask the user to figure it
out by hand.
So yes, there will always be cases where directory-id won't be able to
handle a hypothetical source tree reorganization. It really only
helps in the case where you are doing a true, full move of the
directory, i.e.:
scm mvdir src/plugin/innodb src/plugin/innodb-legacy
scm mvdir src/plugin/innodb-experimental src/plugin/innodb
- Ted
next prev parent reply other threads:[~2009-02-05 21:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-02 18:48 Comments on "Understanding Version Control" by Eric S. Raymond Jakub Narebski
2009-02-02 20:24 ` Theodore Tso
2009-02-02 20:35 ` Eric S. Raymond
2009-02-03 20:57 ` Jakub Narebski
2009-02-04 2:04 ` Jakub Narebski
2009-02-04 23:54 ` Theodore Tso
2009-02-05 0:04 ` Junio C Hamano
2009-02-05 2:43 ` Theodore Tso
2009-02-05 6:24 ` Junio C Hamano
2009-02-05 13:28 ` Theodore Tso
2009-02-05 23:06 ` Junio C Hamano
2009-02-05 0:08 ` Jakub Narebski
2009-02-05 0:49 ` Theodore Tso
2009-02-05 6:01 ` Miles Bader
2009-02-05 9:34 ` Eric S. Raymond
2009-02-05 11:23 ` Jakub Narebski
2009-02-05 13:16 ` Theodore Tso
2009-02-05 17:36 ` Jakub Narebski
2009-02-05 21:45 ` Theodore Tso [this message]
2009-02-04 22:14 ` Tests for " Jakub Narebski
2009-02-10 1:20 ` Comments on " Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090205214536.GB9814@mit.edu \
--to=tytso@mit$(echo .)edu \
--cc=esr@thyrsus$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jnareb@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox