emacs-devel
[Top][All Lists]
Advanced

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

Re: corrupted ,v files break cvs-to-git mirror


From: Jim Meyering
Subject: Re: corrupted ,v files break cvs-to-git mirror
Date: Thu, 30 Aug 2007 09:58:44 +0200

Jan Djärv <address@hidden> wrote:
...
> Yes, I did that.  How else can we preserve the CVS log when moving
> files?  But I guess the whole file can be removed, it was obsolete in
> emacs 22.1, so for 23.1 it should be OK to remove, no?

Dare I say it? :-)

Use better software for version-control.

For example, git can detect renames like that automatically,
based on similarity of removed and added-elsewhere content.
When you rename or copy a file, you can see it in logs and diff
output, e.g., like this:

[here, I renamed "r" to "s" and moved part of
"r"s data to the new file, "t", along the way.
Hence the "similarity index 68%" for r->s. ]

    $ git-log -C -M -p -1
    commit 55f682db0aa88af169d8812f366348a8b05f70e0
    Author: Jim Meyering <address@hidden>
    Date:   Thu Aug 30 09:42:59 2007 +0200

        .

    diff --git a/r b/s
    similarity index 68%
    rename from r
    rename to s
    index 6006ca4..748f1f3 100644
    --- a/r
    +++ b/s
    @@ -27,15 +27,3 @@
     27
     28
     29
    -30
    -31
    -32
    -33
    -34
    -35
    -36
    -37
    -38
    -39
    -40
    -41
    diff --git a/t b/t
    new file mode 100644
    index 0000000..36763a7
    --- /dev/null
    +++ b/t
    @@ -0,0 +1,12 @@
    +30
    +31
    +32
    +33
    +34
    +35
    +36
    +37
    +38
    +39
    +40
    +41




reply via email to

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