Mercurial > hg
view tests/test-mq-qfold.out @ 11628:68a30daead3f stable
inotify: make inotifydirstate.status() returns a tuple of lists.
This makes it consistent with dirstate.status(), which is important if
there are other extensions messing with the output of status(). Those
extensions can safely assume that dirstate.status() returns a tuple of
lists, because its docstring says it does. But
inotifystatus.dirstate() returns a list of lists, which can break
those other extensions.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Tue, 20 Jul 2010 14:00:47 -0400 |
parents | 8cb81d75730c |
children |
line wrap: on
line source
% init adding a % fold in the middle of the queue popping p3 popping p2 now at: p1 --- a/a +++ b/a @@ -1,1 +1,2 @@ a +a p1 p3 --- a/a +++ b/a @@ -1,1 +1,3 @@ a +a +b % fold with local changes abort: local changes found, refresh first --- a/a +++ b/a @@ -1,1 +1,3 @@ a +a +b reverting a % fold git patch into a regular patch, expect git patch popping git now at: regular # HG changeset patch # Parent diff --git a/a b/a --- a/a +++ b/a @@ -1,3 +1,4 @@ a a b +a diff --git a/a b/aa copy from a copy to aa --- a/a +++ b/aa @@ -1,3 +1,4 @@ a a b +a popping regular now at: p1 % fold regular patch into a git patch, expect git patch popping regular now at: git # HG changeset patch # Parent diff --git a/a b/aa copy from a copy to aa --- a/a +++ b/aa @@ -1,3 +1,4 @@ a a b +b