chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split brain: Rename quilt mode `apply' to `unapplied'
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 99cb7fe29196830abc0f483bb703f169adf806d6..4ac5748b15f2cf8a45dec2d095a2436b40a92a53 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-61,7
+61,7
@@
our $cleanmode;
our $changes_since_version;
our $rmchanges;
our $quilt_mode;
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;
our $we_are_responder;
our $initiator_tempdir;
@@
-2540,7
+2540,7
@@
sub quiltify_tree_sentinelfiles ($) {
sub quiltify_splitbrain () {
# memoisation via git-reflog
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,)) {}
die "xxx not yet implemented";
# if ($may_apply &&
# quiltify_trees_differ($userhead,)) {}
@@
-3024,8
+3024,8
@@
END
} elsif (!($user2applied & $applied2unapplied)) {
push @failsuggestion, "This might be a patches-applied branch.";
}
} 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();
if ($quilt_mode =~ m/gbp|dpm|apply/) {
quiltify_splitbrain();