all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Jim Meyering <jim@meyering.net>
To: "Jan Djärv" <jan.h.d@swipnet.se>
Cc: emacs-devel@gnu.org, Miles Bader <miles@gnu.org>
Subject: Re: corrupted ,v files break cvs-to-git mirror
Date: Thu, 30 Aug 2007 09:58:44 +0200	[thread overview]
Message-ID: <877indpi6j.fsf@rho.meyering.net> (raw)
In-Reply-To: <46D536A3.3010908@swipnet.se> ("Jan Djärv"'s message of "Wed\, 29 Aug 2007 11\:04\:35 +0200")

Jan Djärv <jan.h.d@swipnet.se> 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 <jim@meyering.net>
    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

  parent reply	other threads:[~2007-08-30  7:58 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-29  8:34 corrupted ,v files break cvs-to-git mirror Jim Meyering
2007-08-29  8:39 ` Miles Bader
2007-08-29  9:04   ` Jan Djärv
2007-08-29  9:34     ` David Kastrup
2007-08-29  9:55       ` Jan Djärv
2007-08-29  9:40     ` Andreas Schwab
2007-08-29 15:06     ` Stefan Monnier
2007-08-30  7:58     ` Jim Meyering [this message]
2007-08-30  7:25   ` Jim Meyering
2007-08-30 21:38     ` emacs.git is in sync again [Re: corrupted , v " Jim Meyering

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=877indpi6j.fsf@rho.meyering.net \
    --to=jim@meyering.net \
    --cc=emacs-devel@gnu.org \
    --cc=jan.h.d@swipnet.se \
    --cc=miles@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.