Version in base suite: 12.15

Base version: dgit_12.15
Target version: dgit_12.16
Base file: /srv/ftp-master.debian.org/ftp/pool/main/d/dgit/dgit_12.15.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/d/dgit/dgit_12.16.dsc

 debian/changelog      |   10 ++++++++++
 git-debrebase         |   10 ++++++++--
 tests/tests/gdr-merge |    1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

gpgv: Signature made Sun Jun 22 17:49:47 2025 UTC
gpgv:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
gpgv: Can't check signature: No public key
dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmpiwrimub6/dgit_12.15.dsc: no acceptable signature found
diff -Nru dgit-12.15/debian/changelog dgit-12.16/debian/changelog
--- dgit-12.15/debian/changelog	2025-06-22 16:53:17.000000000 +0000
+++ dgit-12.16/debian/changelog	2025-10-05 20:23:23.000000000 +0000
@@ -1,3 +1,13 @@
+dgit (12.16) trixie; urgency=medium
+
+  git-debrebase bugfix:
+  * Merge resolution: Fix erroneous use of real git tree as
+    if it were a private working area.  Closes: #1116933.
+  * Merge resolution: Fix conflation of different temporary directories.
+  * Clean out all of the temporary playground area on every invocation.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 05 Oct 2025 21:23:23 +0100
+
 dgit (12.15) unstable; urgency=medium
 
   git-debpush bugfixes:
diff -Nru dgit-12.15/git-debrebase dgit-12.16/git-debrebase
--- dgit-12.15/git-debrebase	2025-06-22 16:53:17.000000000 +0000
+++ dgit-12.16/git-debrebase	2025-10-05 20:23:23.000000000 +0000
@@ -120,20 +120,25 @@
 our $playprefix = 'debrebase';
 our $rd;
 our $workarea;
+our @workarea_recursion;
 
 our @dgit = qw(dgit);
 
 sub in_workarea ($) {
     my ($sub) = @_;
     changedir $workarea;
+    push @workarea_recursion, $workarea;
     my $r = eval { $sub->(); };
-    { local $@; changedir $maindir; }
+    pop @workarea_recursion;
+    my $prev_dir = $workarea_recursion[-1] // $maindir;
+    { local $@; changedir $prev_dir; }
     die $@ if $@;
 }
 
 sub fresh_workarea (;$) {
     my ($subdir) = @_;
     $subdir //= 'work';
+    $subdir .= scalar @workarea_recursion;
     $workarea = fresh_playground "$playprefix/$subdir";
     in_workarea sub { playtree_setup };
 }
@@ -3010,7 +3015,8 @@
 
 changedir_git_toplevel();
 
-$rd = fresh_playground "$playprefix/misc";
+fresh_playground "$playprefix";
+$rd = ensure_a_playground "$playprefix/misc";
 
 @opt_anchors = map { git_rev_parse $_ } @opt_anchors;
 
diff -Nru dgit-12.15/tests/tests/gdr-merge dgit-12.16/tests/tests/gdr-merge
--- dgit-12.15/tests/tests/gdr-merge	2025-06-22 16:53:17.000000000 +0000
+++ dgit-12.16/tests/tests/gdr-merge	2025-10-05 20:23:23.000000000 +0000
@@ -20,6 +20,7 @@
 
 git checkout -b other
 t-some-changes other '' -other
+t-git-debrebase -funclean-mixed -funclean-ordering make-patches
 
 echo 'other-conflict' >>debian/zorkmid
 git commit -m 'other-conflict' debian/zorkmid