git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
To: Sverre Rabbelier <srabbelier@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [ANNOUNCE] Git 1.7.5.1
Date: Thu, 5 May 2011 19:40:40 +0200	[thread overview]
Message-ID: <BANLkTi=7=gnirqkV=ygf_FOytdAT3L0iNA@mail.gmail.com> (raw)
In-Reply-To: <BANLkTikV0-efkU+V90i=hPkMLYXi2Puw4w@mail.gmail.com>

On Thu, May 5, 2011 at 1:13 PM, Sverre Rabbelier <srabbelier@gmail.com> wrote:
> Heya,
>
> On Thu, May 5, 2011 at 03:35, Junio C Hamano <gitster@pobox.com> wrote:
>>  * "git stash apply" used to refuse to work if there was any change in
>>   the working tree, even when the change did not overlap with the change
>>   the stash recorded.
>
> Does this mean that I won't get the "you have unstaged changes, please
> add them" message anymore for the non-overlapping case? If so, nice!

I think this also partially fixes problem with git-svn and concurrency described
here: http://article.gmane.org/gmane.comp.version-control.git/171481

git-svn now works correctly if during dcommit someone else made a change to
svn repository but the change did not touch dcommited file.

It still stops and looses history if change was in the same file.

Thanks,

-- 
Piotr Krukowiecki

      reply	other threads:[~2011-05-05 17:41 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-05  1:35 [ANNOUNCE] Git 1.7.5.1 Junio C Hamano
2011-05-05 11:13 ` Sverre Rabbelier
2011-05-05 17:40   ` Piotr Krukowiecki [this message]

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='BANLkTi=7=gnirqkV=ygf_FOytdAT3L0iNA@mail.gmail.com' \
    --to=piotr.krukowiecki@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=srabbelier@gmail.com \
    /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.
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 NNTP newsgroup(s).