our $changes_since_version;
our $rmchanges;
our $quilt_mode;
-our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|apply';
+our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|unapplied';
our $we_are_responder;
our $initiator_tempdir;
sub quiltify_trees_differ ($$;$) {
my ($x,$y,$finegrained) = @_;
# returns true iff the two tree objects differ other than in debian/
- # returns bitmas 01 - differ in upstream files except .gitignore
- # 02 - differ in .gitignore
+ # with $finegrained,
+ # returns bitmask 01 - differ in upstream files except .gitignore
+ # 02 - differ in .gitignore
local $/=undef;
my @cmd = (@git, qw(diff-tree --name-only -z));
push @cmd, qw(-r) if $finegrained;
sub quiltify_splitbrain () {
# memoisation via git-reflog
- my $may_apply = $quilt_mode =~ m/gbp|apply/;
+ my $may_apply = $quilt_mode =~ m/gbp|unapplied/;
die "xxx not yet implemented";
# if ($may_apply &&
# quiltify_trees_differ($userhead,)) {}
} elsif (!($user2applied & $applied2unapplied)) {
push @failsuggestion, "This might be a patches-applied branch.";
}
- push @failsuggestion,
- "Maybe you need to specify one of --quilt=apply --quilt=gbp --quilt=dpm ?";
+ push @failsuggestion, "Maybe you need to specify one of".
+ " --quilt=gbp --quilt=dpm --quilt=unapplied ?";
if ($quilt_mode =~ m/gbp|dpm|apply/) {
quiltify_splitbrain();