Hello community,
here is the log from the commit of package guilt
checked in at Wed Oct 8 11:47:09 CEST 2008.
--------
--- guilt/guilt.changes 2008-05-26 13:11:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/guilt/guilt.changes 2008-10-07 19:23:26.000000000 +0200
@@ -1,0 +2,17 @@
+Tue Oct 07 19:11:55 CEST 2008 - bwalle@suse.de
+
+- Require docbook-xsl-stylesheets, docbook_4 and docbook_3 to
+ avoid downloading of XSL style sheets and build without network.
+- Require sgml-skel because that is required by docbook RPMs.
+
+-------------------------------------------------------------------
+Tue Oct 07 12:01:11 CEST 2008 - bwalle@suse.de
+
+- update to 0.31.2 (works with git 1.6)
+
+-------------------------------------------------------------------
+Tue Oct 07 10:53:53 CEST 2008 - bwalle@suse.de
+
+- update to 0.31
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
guilt-0.30.tar.bz2
New:
----
guilt-0.31.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ guilt.spec ++++++
--- /var/tmp/diff_new_pack.l19928/_old 2008-10-08 11:46:31.000000000 +0200
+++ /var/tmp/diff_new_pack.l19928/_new 2008-10-08 11:46:31.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package guilt (Version 0.30)
+# spec file for package guilt (Version 0.31.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -13,10 +20,11 @@
Url: http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/
Name: guilt
-BuildRequires: asciidoc xmlto
+BuildRequires: asciidoc docbook-xsl-stylesheets docbook_3 docbook_4 xmlto
+BuildRequires: sgml-skel
Summary: quilt on top of git
-Version: 0.30
-Release: 2
+Version: 0.31.2
+Release: 1
Source0: %{name}-%{version}.tar.bz2
License: GPL v2 only
Group: Productivity/Text/Utilities
@@ -66,5 +74,13 @@
%{_mandir}/man7/*
%changelog
+* Tue Oct 07 2008 bwalle@suse.de
+- Require docbook-xsl-stylesheets, docbook_4 and docbook_3 to
+ avoid downloading of XSL style sheets and build without network.
+- Require sgml-skel because that is required by docbook RPMs.
+* Tue Oct 07 2008 bwalle@suse.de
+- update to 0.31.2 (works with git 1.6)
+* Tue Oct 07 2008 bwalle@suse.de
+- update to 0.31
* Mon May 26 2008 bwalle@suse.de
- new package
++++++ guilt-0.30.tar.bz2 -> guilt-0.31.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/Documentation/asciidoc.conf new/guilt-0.31.2/Documentation/asciidoc.conf
--- old/guilt-0.30/Documentation/asciidoc.conf 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/Documentation/asciidoc.conf 2008-09-21 19:51:24.000000000 +0200
@@ -1,6 +1,6 @@
-## guiltlink: macro
+## linkguilt: macro
#
-# Usage: guiltlink:command[manpage-section]
+# Usage: linkguilt:command[manpage-section]
#
# Note, {0} is the manpage section, while {target} is the command.
#
@@ -14,7 +14,7 @@
tilde=~
ifdef::backend-docbook[]
-[guiltlink-inlinemacro]
+[linkguilt-inlinemacro]
{0%{target}}
{0#<citerefentry>}
{0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
@@ -33,8 +33,25 @@
endif::backend-docbook[]
ifdef::backend-xhtml11[]
-[guiltlink-inlinemacro]
+[linkguilt-inlinemacro]
<a href="{target}.html">{target}{0?({0})}</a>
endif::backend-xhtml11[]
-
+ifdef::doctype-manpage[]
+ifdef::backend-docbook[]
+[header]
+template::[header-declarations]
+<refentry>
+<refmeta>
+<refentrytitle>{mantitle}</refentrytitle>
+<manvolnum>{manvolnum}</manvolnum>
+<refmiscinfo class="source">Guilt</refmiscinfo>
+<refmiscinfo class="version">{version}</refmiscinfo>
+<refmiscinfo class="manual">Guilt Manual</refmiscinfo>
+</refmeta>
+<refnamediv>
+ <refname>{manname}</refname>
+ <refpurpose>{manpurpose}</refpurpose>
+</refnamediv>
+endif::backend-docbook[]
+endif::doctype-manpage[]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/Documentation/cmd-list.sh new/guilt-0.31.2/Documentation/cmd-list.sh
--- old/guilt-0.30/Documentation/cmd-list.sh 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/Documentation/cmd-list.sh 2008-09-21 19:51:24.000000000 +0200
@@ -21,7 +21,7 @@
exit 1
fi
- echo "guiltlink:$cmd[1]::"
+ echo "linkguilt:$cmd[1]::"
echo " $desc."
echo ""
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/Documentation/footer.txt new/guilt-0.31.2/Documentation/footer.txt
--- old/guilt-0.30/Documentation/footer.txt 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/Documentation/footer.txt 2008-09-21 19:51:24.000000000 +0200
@@ -1,5 +1,5 @@
GUILT
-----
-Part of the guiltlink:guilt[7] suite
+Part of the linkguilt:guilt[7] suite
include::version.txt[]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/Documentation/guilt-diff.txt new/guilt-0.31.2/Documentation/guilt-diff.txt
--- old/guilt-0.30/Documentation/guilt-diff.txt 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/Documentation/guilt-diff.txt 2008-09-21 19:51:24.000000000 +0200
@@ -20,6 +20,9 @@
Output a interdiff against the top-most applied patch. This should
produce the same diff as "guilt-new -f foo".
+<path>...::
+ Restrict diff output to a given set of files.
+
Author
------
Written by Josef "Jeff" Sipek
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/Documentation/guilt-next.txt new/guilt-0.31.2/Documentation/guilt-next.txt
--- old/guilt-0.30/Documentation/guilt-next.txt 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/Documentation/guilt-next.txt 2008-09-21 19:51:24.000000000 +0200
@@ -11,8 +11,8 @@
DESCRIPTION
-----------
-Output the name of next patch to be pushed. If guilt-push(1) is issued, this
-patch would be the topmost patch.
+Output the name of next patch to be pushed. If linkguilt:guilt-push[1] is
+issued, this patch would be the topmost patch.
OPTIONS
-------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/Documentation/guilt-prev.txt new/guilt-0.31.2/Documentation/guilt-prev.txt
--- old/guilt-0.30/Documentation/guilt-prev.txt 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/Documentation/guilt-prev.txt 2008-09-21 19:51:24.000000000 +0200
@@ -11,7 +11,7 @@
DESCRIPTION
-----------
-Output name of second topmost applied patch. If guiltlink:guilt-pop[1] is used, this
+Output name of second topmost applied patch. If linkguilt:guilt-pop[1] is used, this
patch will become the topmost patch.
OPTIONS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/Documentation/guilt.txt new/guilt-0.31.2/Documentation/guilt.txt
--- old/guilt-0.30/Documentation/guilt.txt 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/Documentation/guilt.txt 2008-09-21 19:51:24.000000000 +0200
@@ -57,9 +57,9 @@
updates the stack top (${branch}_top), stack bottom (${branch}_bottom), and
stack base (${branch}_base) tags.
- Top: Top-most applied patch/commit
- Bottom: Bottom-most applied patch/commit
- Base: Commit on top of which the bottom most patch is applied
+Top:: Top-most applied patch/commit
+Bottom:: Bottom-most applied patch/commit
+Base:: Commit on top of which the bottom most patch is applied
Having these three tags, one can easily get the log/diff/other information
only for commits that are (or are not!) part of the patch stack.
@@ -67,24 +67,23 @@
Since some users may not want to have Guilt autotag, a Git config setting
guilt.autotag can be used to turn it on or off.
- If none of the config files (system, global, etc.) contain a
- guilt.autotag, the feature defaults to being on.
+ - If none of the config files (system, global, etc.) contain a guilt.autotag,
+ the feature defaults to being on.
- If one or more config file contains the value, regular
- git-config(1) rules apply.
+ - If one or more config file contains the value, regular git-config(1) rules
+ apply.
-During guilt-init(1), the rules are:
+During linkguilt:guilt-init[1], the rules are:
- If none of the config files contain guilt.autotag, the repository
- config file's guilt.autotag is set to the default (on).
+ - If none of the config files contain guilt.autotag, the repository config
+ file's guilt.autotag is set to the default (on).
- If there already exists a setting in any of the config files, and
- neither of the autotagging related options is used, no local value
- is set.
+ - If there already exists a setting in any of the config files, and neither
+ of the autotagging related options is used, no local value is set.
- If there already exists a setting in any of the config files, but
- an autotagging option is specified, the repository config file's
- guilt.autotag is set to the value specified on the command line.
+ - If there already exists a setting in any of the config files, but an
+ autotagging option is specified, the repository config file's guilt.autotag
+ is set to the value specified on the command line.
GUILT COMMANDS
--------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/Documentation/hooks.txt new/guilt-0.31.2/Documentation/hooks.txt
--- old/guilt-0.30/Documentation/hooks.txt 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/Documentation/hooks.txt 2008-09-21 19:51:24.000000000 +0200
@@ -9,4 +9,4 @@
delete <patch name>::
Executed when a patch is deleted from the patch series via
- guiltlink:guilt-delete[1].
+ linkguilt:guilt-delete[1].
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/Documentation/Makefile new/guilt-0.31.2/Documentation/Makefile
--- old/guilt-0.30/Documentation/Makefile 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/Documentation/Makefile 2008-09-21 19:51:24.000000000 +0200
@@ -7,6 +7,7 @@
DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
USAGE=$(patsubst %.txt,usage-%.txt,$(MAN1_TXT))
+VERSION=$(shell git describe)
prefix?=$(PREFIX)
bindir?=$(prefix)/bin
@@ -50,7 +51,7 @@
-include doc.dep
version.txt:
- echo "(Generated for Guilt `git-describe`)" > version.txt
+ echo "(Generated for Guilt $(VERSION))" > version.txt
cmds.txt: cmd-list.sh $(MAN1_TXT)
sh ./cmd-list.sh
@@ -73,4 +74,4 @@
xmlto -m callouts.xsl man $<
%.xml : %.txt footer.txt version.txt
- $(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf $<
+ $(ASCIIDOC) -b docbook -a version=$(VERSION) -d manpage -f asciidoc.conf $<
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/guilt new/guilt-0.31.2/guilt
--- old/guilt-0.30/guilt 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/guilt 2008-09-21 19:51:24.000000000 +0200
@@ -3,8 +3,8 @@
# Copyright (c) Josef "Jeff" Sipek, 2006-2008
#
-GUILT_VERSION="0.30"
-GUILT_NAME="Rio"
+GUILT_VERSION="0.31.2"
+GUILT_NAME="Ciuleandra"
# If the first argument is one of the below, display the man page instead of
# the rather silly and mostly useless usage string
@@ -23,14 +23,15 @@
# we change directories ourselves
SUBDIRECTORY_OK=1
-. git-sh-setup
+. "$(git --exec-path)/git-sh-setup"
#
# Git version check
#
-gitver=`git --version | cut -d' ' -f3`
+gitver=`git --version | cut -d' ' -f3 | sed -e 's/^debian\.//'`
case "$gitver" in
1.5.*) ;; # git config
+ 1.6.*) ;; # git config
*) die "Unsupported version of git ($gitver)" ;;
esac
@@ -495,6 +496,7 @@
# usage: must_commit_first
must_commit_first()
{
+ git update-index --refresh --unmerged -q > /dev/null
[ `git diff-files | wc -l` -eq 0 ]
return $?
}
@@ -595,13 +597,13 @@
return 0
}
-# usage: get_tmp_file <prefix>
+# usage: get_tmp_file <prefix> [<opts>]
#
# Get a unique filename and create the file in a non-racy way
get_tmp_file()
{
while true; do
- mktemp "/tmp/guilt.$1.XXXXXXXXXXXXXXX" && break
+ mktemp $2 "/tmp/guilt.$1.XXXXXXXXXXXXXXX" && break
done
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/guilt-branch new/guilt-0.31.2/guilt-branch
--- old/guilt-0.30/guilt-branch 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/guilt-branch 2008-09-21 19:51:24.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) Josef "Jeff" Sipek, 2007
+# Copyright (c) Josef "Jeff" Sipek, 2007-2008
#
USAGE="[]"
@@ -25,10 +25,19 @@
die "Patch directory for branch \"$newbranch\" already exists."
fi
+cat "$applied" | while read n; do
+ git update-ref "refs/patches/$newbranch/$n" \
+ `git rev-parse "refs/patches/$branch/$n"` ""
+done
+
git branch "$newbranch"
git checkout "$newbranch"
mkdir -p "$GUILT_DIR/`dirname $newbranch`"
-# copy the patch
+# copy the patch dir
cp -a "$GUILT_DIR/$branch" "$GUILT_DIR/$newbranch"
+
+# copy the refs
+
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/guilt-delete new/guilt-0.31.2/guilt-delete
--- old/guilt-0.30/guilt-delete 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/guilt-delete 2008-09-21 19:51:24.000000000 +0200
@@ -31,6 +31,10 @@
die "You must specify a patch to delete"
fi
+if [ ! -f "$GUILT_DIR/$branch/$patch" ]; then
+ die "Patch $patch does not exist."
+fi
+
p=`grep -e "^$patch$" < "$applied"`
if [ ! -z "$p" ] ; then
die "Cannot delete an applied patch"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/guilt-diff new/guilt-0.31.2/guilt-diff
--- old/guilt-0.30/guilt-diff 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/guilt-diff 2008-09-21 19:51:24.000000000 +0200
@@ -3,21 +3,24 @@
# Copyright (C) 2007 Josef 'Jeff' Sipek
#
-USAGE="[-z]"
+USAGE="[-z] [<path>...]"
. `dirname $0`/guilt
while [ $# -ne 0 ]; do
case "$1" in
-z)
working_tree=t ;;
- *)
+ -* | --*)
usage ;;
+
+ *)
+ break ;;
esac
shift
done
-if [ ! -z "$working_tree" ] ; then
- git diff
-else
- git diff HEAD^
-fi
+PREV=HEAD^
+[ -z "`get_top`" ] && PREV=
+[ ! -z "$working_tree" ] && PREV=
+
+git diff $PREV -- "$@"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/guilt-fold new/guilt-0.31.2/guilt-fold
--- old/guilt-0.30/guilt-fold 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/guilt-fold 2008-09-21 19:51:24.000000000 +0200
@@ -20,6 +20,11 @@
die "No patch name supplied."
fi
+# make sure it is a file
+if [ ! -f "$GUILT_DIR/$branch/$patch" ]; then
+ die "Patch $patch does not exist."
+fi
+
# make sure that there are no unapplied changes
if ! must_commit_first; then
die "Uncommited changes detected. Refresh first."
@@ -31,11 +36,6 @@
die "Patch is applied. Pop the patch first."
fi
-# make sure it is a file
-if [ ! -f "$GUILT_DIR/$branch/$patch" ]; then
- die "Patch '$patch' is not a regular file."
-fi
-
fold_patch "$patch"
# back it up just in case :)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/guilt-patchbomb new/guilt-0.31.2/guilt-patchbomb
--- old/guilt-0.30/guilt-patchbomb 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/guilt-patchbomb 2008-09-21 19:51:24.000000000 +0200
@@ -40,10 +40,7 @@
die "Aborting..."
fi
-dir=/tmp/patches-$RANDOM/
-if [ -e $dir ]; then
- die "Conspiracy uncovered: Temporary dir '$dir' already exists"
-fi
+dir=`get_tmp_file patchbomb -d`
disp "Using '$dir' as temporary directory"
# more than one patch?
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/regression/scaffold new/guilt-0.31.2/regression/scaffold
--- old/guilt-0.30/regression/scaffold 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/regression/scaffold 2008-09-21 19:51:24.000000000 +0200
@@ -26,7 +26,9 @@
function replace_path
{
sed -e "s,$PWD,PATH,g" \
- -e "s,$REG_DIR,REGDIR,g"
+ -e "s,$REG_DIR,REGDIR,g" \
+ -e "s,\.\.\. initial, initial,g" \
+ -e "s,^Already on branch,Already on,g"
}
function filter_dd
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/regression/t-010.out new/guilt-0.31.2/regression/t-010.out
--- old/guilt-0.30/regression/t-010.out 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/regression/t-010.out 2008-09-21 19:51:24.000000000 +0200
@@ -1,7 +1,7 @@
% setup_git_repo
% reset_git_repo
-Already on branch "master"
-HEAD is now at d485041... initial
+Already on "master"
+HEAD is now at d485041 initial
% guilt-init
% list_files
d .git/patches
@@ -16,8 +16,8 @@
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/series
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
% reset_git_repo
-Already on branch "master"
-HEAD is now at d485041... initial
+Already on "master"
+HEAD is now at d485041 initial
% guilt-init -a
% list_files
d .git/patches
@@ -32,8 +32,8 @@
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/series
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
% reset_git_repo
-Already on branch "master"
-HEAD is now at d485041... initial
+Already on "master"
+HEAD is now at d485041 initial
% guilt-init -n
% list_files
d .git/patches
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/regression/t-027.out new/guilt-0.31.2/regression/t-027.out
--- old/guilt-0.30/regression/t-027.out 2008-04-11 01:24:06.000000000 +0200
+++ new/guilt-0.31.2/regression/t-027.out 2008-09-21 19:51:24.000000000 +0200
@@ -11,7 +11,7 @@
f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
% git-reset --hard HEAD
-HEAD is now at d485041... initial
+HEAD is now at d485041 initial
% guilt-push modify
Applying patch..modify
Patch applied.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/regression/t-052.out new/guilt-0.31.2/regression/t-052.out
--- old/guilt-0.30/regression/t-052.out 1970-01-01 01:00:00.000000000 +0100
+++ new/guilt-0.31.2/regression/t-052.out 2008-09-21 19:51:24.000000000 +0200
@@ -0,0 +1,370 @@
+% setup_repo
+% list_files
+d .git/patches
+d .git/patches/master
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/master/add
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/master/remove
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
+% guilt branch br-
+Switched to branch "br-"
+% list_files
+d .git/patches
+d .git/patches/br-
+d .git/patches/master
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/master/add
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/master/remove
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/br-/status
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
+% git checkout master
+Switched to branch "master"
+% list_files
+d .git/patches
+d .git/patches/br-
+d .git/patches/master
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/master/add
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/master/remove
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/br-/status
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
+Applying patch..modify
+Patch applied.
+% guilt branch br-modify
+Switched to branch "br-modify"
+% list_files
+d .git/patches
+d .git/patches/br-
+d .git/patches/br-modify
+d .git/patches/master
+d .git/refs/patches
+d .git/refs/patches/br-modify
+d .git/refs/patches/master
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-modify/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-modify/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/master/add
+f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/br-modify/status
+f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/master/status
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-modify/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/master/remove
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-modify/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-modify/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/br-/status
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-modify/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify
+% git checkout master
+Switched to branch "master"
+% list_files
+d .git/patches
+d .git/patches/br-
+d .git/patches/br-modify
+d .git/patches/master
+d .git/refs/patches
+d .git/refs/patches/br-modify
+d .git/refs/patches/master
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-modify/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-modify/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/master/add
+f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/br-modify/status
+f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/master/status
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-modify/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/master/remove
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-modify/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-modify/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/br-/status
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-modify/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify
+Applying patch..add
+Patch applied.
+% guilt branch br-add
+Switched to branch "br-add"
+% list_files
+d .git/patches
+d .git/patches/br-
+d .git/patches/br-add
+d .git/patches/br-modify
+d .git/patches/master
+d .git/refs/patches
+d .git/refs/patches/br-add
+d .git/refs/patches/br-modify
+d .git/refs/patches/master
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-add/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-modify/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-add/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-modify/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/master/add
+f 6e9645b29c7233ecdf1494834e83c67a37464548 .git/patches/br-add/status
+f 6e9645b29c7233ecdf1494834e83c67a37464548 .git/patches/master/status
+f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/br-modify/status
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-add/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-modify/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/master/remove
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-add/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-modify/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-add/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-modify/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/br-/status
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-add/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-modify/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/br-add/add
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/master/add
+% git checkout master
+Switched to branch "master"
+% list_files
+d .git/patches
+d .git/patches/br-
+d .git/patches/br-add
+d .git/patches/br-modify
+d .git/patches/master
+d .git/refs/patches
+d .git/refs/patches/br-add
+d .git/refs/patches/br-modify
+d .git/refs/patches/master
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-add/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-modify/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-add/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-modify/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/master/add
+f 6e9645b29c7233ecdf1494834e83c67a37464548 .git/patches/br-add/status
+f 6e9645b29c7233ecdf1494834e83c67a37464548 .git/patches/master/status
+f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/br-modify/status
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-add/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-modify/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/master/remove
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-add/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-modify/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-add/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-modify/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/br-/status
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-add/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-modify/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/br-add/add
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/master/add
+Applying patch..remove
+Patch applied.
+% guilt branch br-remove
+Switched to branch "br-remove"
+% list_files
+d .git/patches
+d .git/patches/br-
+d .git/patches/br-add
+d .git/patches/br-modify
+d .git/patches/br-remove
+d .git/patches/master
+d .git/refs/patches
+d .git/refs/patches/br-add
+d .git/refs/patches/br-modify
+d .git/refs/patches/br-remove
+d .git/refs/patches/master
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-add/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-modify/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-remove/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-add/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-modify/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-remove/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/master/add
+f 6e9645b29c7233ecdf1494834e83c67a37464548 .git/patches/br-add/status
+f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/br-modify/status
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-add/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-modify/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-remove/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/master/remove
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-add/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-modify/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-remove/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-add/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-modify/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-remove/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/br-/status
+f f322f08d907e3737a4321b0ec90bc545f71af7cf .git/patches/br-remove/status
+f f322f08d907e3737a4321b0ec90bc545f71af7cf .git/patches/master/status
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-add/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-modify/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-remove/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/br-add/add
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/br-remove/add
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/master/add
+r e67345cf1e7e9594c73efad7381a994f1fe63b14 .git/refs/patches/br-remove/remove
+r e67345cf1e7e9594c73efad7381a994f1fe63b14 .git/refs/patches/master/remove
+% git checkout master
+Switched to branch "master"
+% list_files
+d .git/patches
+d .git/patches/br-
+d .git/patches/br-add
+d .git/patches/br-modify
+d .git/patches/br-remove
+d .git/patches/master
+d .git/refs/patches
+d .git/refs/patches/br-add
+d .git/refs/patches/br-modify
+d .git/refs/patches/br-remove
+d .git/refs/patches/master
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-add/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-modify/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-remove/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-add/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-modify/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-remove/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/master/add
+f 6e9645b29c7233ecdf1494834e83c67a37464548 .git/patches/br-add/status
+f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/br-modify/status
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-add/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-modify/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-remove/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/master/remove
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-add/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-modify/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-remove/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-add/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-modify/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-remove/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/br-/status
+f f322f08d907e3737a4321b0ec90bc545f71af7cf .git/patches/br-remove/status
+f f322f08d907e3737a4321b0ec90bc545f71af7cf .git/patches/master/status
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-add/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-modify/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-remove/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/br-add/add
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/br-remove/add
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/master/add
+r e67345cf1e7e9594c73efad7381a994f1fe63b14 .git/refs/patches/br-remove/remove
+r e67345cf1e7e9594c73efad7381a994f1fe63b14 .git/refs/patches/master/remove
+Applying patch..mode
+Patch applied.
+% guilt branch br-mode
+Switched to branch "br-mode"
+% list_files
+d .git/patches
+d .git/patches/br-
+d .git/patches/br-add
+d .git/patches/br-mode
+d .git/patches/br-modify
+d .git/patches/br-remove
+d .git/patches/master
+d .git/refs/patches
+d .git/refs/patches/br-add
+d .git/refs/patches/br-mode
+d .git/refs/patches/br-modify
+d .git/refs/patches/br-remove
+d .git/refs/patches/master
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-add/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-mode/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-modify/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/br-remove/mode
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-add/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-mode/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-modify/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/br-remove/add
+f 5d8322e2edfca0589cc24df9c09985a544591a2c .git/patches/master/add
+f 6e9645b29c7233ecdf1494834e83c67a37464548 .git/patches/br-add/status
+f 71596bf71b72c2717e1aee378aabefbfa19ab7c8 .git/patches/br-mode/status
+f 71596bf71b72c2717e1aee378aabefbfa19ab7c8 .git/patches/master/status
+f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/br-modify/status
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-add/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-mode/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-modify/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/br-remove/remove
+f 8bdf2abdb045e63bb877890db12afcd5a2f023eb .git/patches/master/remove
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-add/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-mode/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-modify/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/br-remove/series
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-add/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-mode/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-modify/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/br-remove/modify
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/br-/status
+f f322f08d907e3737a4321b0ec90bc545f71af7cf .git/patches/br-remove/status
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-add/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-mode/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-modify/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/br-remove/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify
+r 632ca0f5ec27a961990b45673dfc751f1da830f3 .git/refs/patches/br-mode/mode
+r 632ca0f5ec27a961990b45673dfc751f1da830f3 .git/refs/patches/master/mode
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/br-add/add
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/br-mode/add
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/br-remove/add
+r 68f33a015dcfd09c3896f15d152378b54eaa4eb6 .git/refs/patches/master/add
+r e67345cf1e7e9594c73efad7381a994f1fe63b14 .git/refs/patches/br-mode/remove
+r e67345cf1e7e9594c73efad7381a994f1fe63b14 .git/refs/patches/br-remove/remove
+r e67345cf1e7e9594c73efad7381a994f1fe63b14 .git/refs/patches/master/remove
+% git checkout master
+Switched to branch "master"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/guilt-0.30/regression/t-052.sh new/guilt-0.31.2/regression/t-052.sh
--- old/guilt-0.30/regression/t-052.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/guilt-0.31.2/regression/t-052.sh 2008-09-21 19:51:24.000000000 +0200
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Test the commands that use get_*_series, while applying guards
+#
+
+source $REG_DIR/scaffold
+
+cmd setup_repo
+
+for x in "" modify add remove mode ; do
+ cmd list_files
+ [ "$x" != "" ] && guilt push "$x"
+ cmd guilt branch br-$x
+ cmd list_files
+ cmd git checkout master
+done
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
