unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Tino Calancha <tino.calancha@gmail.com>
To: 26084-done@debbugs.gnu.org
Subject: bug#26084: 24.5; epatch save wrong backups in Git multipatches
Date: Tue, 21 Mar 2017 17:29:29 +0900	[thread overview]
Message-ID: <871str9gnq.fsf@calancha-pc> (raw)
In-Reply-To: <87h92xdzli.fsf@calancha-pc> (Tino Calancha's message of "Mon, 13 Mar 2017 23:24:09 +0900")

Tino Calancha <tino.calancha@gmail.com> writes:

> emacs -Q /tmp
> ;; Eval following form:
> (let ((cmd "
> mkdir -p foo
> cd foo
> echo 'qux here' > qux.txt
> echo 'bar here' > bar.txt
> git init
> git add . && git commit -m 'Test repository.'
> echo 'foo here' > qux.txt
> echo 'foo here' > bar.txt
> git diff > ../foo.diff
> git reset --hard HEAD
> "))
>   (call-process-shell-command cmd))
>
> M-x epatch RET n /tmp/foo.diff RET /tmp/foo RET n RET q y RET q y q y
> ;; Eval this form:
> (string=
>  (with-temp-buffer
>    (insert-file-contents "/tmp/foo/bar.txt")
>    (buffer-string))
> (with-temp-buffer
>   (insert-file-contents
>    (concat "/tmp/foo/bar.txt" ediff-backup-extension))
>   (buffer-string)))
> => t ; Should be nil.
Pushed fix into master branch as commit:
abe731eef0fcbc59ef4836e06f6099ea17042b90





  reply	other threads:[~2017-03-21  8:29 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-13 14:24 bug#26084: 24.5; epatch save wrong backups in Git multipatches Tino Calancha
2017-03-21  8:29 ` Tino Calancha [this message]
     [not found] ` <handler.26084.D26084.149008498412423.notifdone@debbugs.gnu.org>
2017-03-31 22:54   ` bug#26084: closed (Re: bug#26084: 24.5; epatch save wrong backups in Git multipatches) Glenn Morris
2017-04-01  3:33     ` Tino Calancha
2017-04-02 15:51       ` Glenn Morris

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

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=871str9gnq.fsf@calancha-pc \
    --to=tino.calancha@gmail.com \
    --cc=26084-done@debbugs.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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).