diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2023-01-03 11:11:31 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2023-01-03 11:11:31 -0700 |
| commit | d6040c47e4e5769807d236f30ea995abfa4d4505 (patch) | |
| tree | 70237c8bc2dd6104891372533d145c7ed6b8defd /debian | |
| parent | 47b1c568a3f75eea243a8e608125bde96acce0e4 (diff) | |
| download | emacs-d6040c47e4e5769807d236f30ea995abfa4d4505.tar.gz | |
d/merge-snapshot: Find merge base with emacs-29 not master
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | debian/merge-snapshot | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 7e281f3ce78..44e62c15f43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +emacs-snapshot (29.1~git20221203.2) UNRELEASED; urgency=medium + + * d/merge-snapshot: Find merge base with origin/emacs-29, not origin/master. + + -- Sean Whitton <spwhitton@spwhitton.name> Tue, 03 Jan 2023 11:10:46 -0700 + emacs-snapshot (29.1~git20221203.1) unstable; urgency=medium * Package git snapshot. diff --git a/debian/merge-snapshot b/debian/merge-snapshot index 83629af517c..5da65344e76 100755 --- a/debian/merge-snapshot +++ b/debian/merge-snapshot @@ -13,7 +13,7 @@ my $git = Git::Wrapper->new(getcwd); ($git->rev_parse({ abbrev_ref => 1 }, "HEAD"))[0] eq "athena/unstable" or $git->checkout("athena/unstable"); -my ($to_merge) = $git->merge_base("melete", "origin/master"); +my ($to_merge) = $git->merge_base("melete", "origin/emacs-29"); chomp(my $prev_version = `dpkg-parsechangelog -SVersion`); chomp(my $prev_distn = `dpkg-parsechangelog -SDistribution`); |