chiark / gitweb /
Ian Jackson [Sun, 18 Feb 2018 14:52:25 +0000 (14:52 +0000)]
git-debrebase: NOTES: reword, record decisions about pm and ffq, tidy
Ian Jackson [Sun, 18 Feb 2018 14:47:02 +0000 (14:47 +0000)]
git-debrebase: NOTES: reword to record decisions about pm and ffq handling
Ian Jackson [Sun, 18 Feb 2018 14:35:55 +0000 (14:35 +0000)]
git-debrebase: test suite: add some t-git-next-date
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 14:35:48 +0000 (14:35 +0000)]
git-debrebase: test suite: test --anchor option
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 14:34:57 +0000 (14:34 +0000)]
git-debrebase: provide --anchor option
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 14:16:54 +0000 (14:16 +0000)]
git-debrebase: test suite: gdr-newupstream-v0: omit upstream
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 14:16:41 +0000 (14:16 +0000)]
git-debrebase: new-upstream-v0: allow upstream to be omitted
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 14:15:03 +0000 (14:15 +0000)]
git-debrebase: test suite: gdr-newupstream-v0: new test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 14:13:53 +0000 (14:13 +0000)]
git-debrebase: new-upstream-v0: call record_ffq_auto (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 14:13:30 +0000 (14:13 +0000)]
git-debrebase: introduce record_ffq_auto (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 13:55:15 +0000 (13:55 +0000)]
git-debrebase: NOTES: a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 13:54:10 +0000 (13:54 +0000)]
git-debrebase: renmae $old_upstream_update* to $old_anchor* (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 13:37:31 +0000 (13:37 +0000)]
git-debrebase: do remaining ref update atomically
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 13:36:27 +0000 (13:36 +0000)]
git-debrebase: do most ref updates together, atomically
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 13:20:53 +0000 (13:20 +0000)]
git-debrebase: test suite: t-gdr-good: fix comment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 13:20:35 +0000 (13:20 +0000)]
git-debrebase: test suite: test ff stitching
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 13:20:23 +0000 (13:20 +0000)]
git-debrebase: stitch: add an update-ref message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 13:20:07 +0000 (13:20 +0000)]
git-debrebase: stitch: ff when possible
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 13:04:53 +0000 (13:04 +0000)]
git-debrebase: be properly selective about StartRewrite
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 12:34:48 +0000 (12:34 +0000)]
git-debrebase: test suite: spot any pointless pseudomerges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 12:30:08 +0000 (12:30 +0000)]
git-debrebase: test suite: spot any merges which have multiple identical parents
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 12:09:11 +0000 (12:09 +0000)]
git-debrebase: Rename `launder' to `launder-v0'
This command is too raw, really, and we may want that name for
something else (eg, rebase and stitch).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 12:02:04 +0000 (12:02 +0000)]
git-debrebase: Recognise anchors by commit annotation, only
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 11:57:09 +0000 (11:57 +0000)]
git-debrebase: Recognise anchors by commit annotation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 11:45:57 +0000 (11:45 +0000)]
git-debrebase: docs etc.: Intend to recognise anchors by commit annotation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 11:35:49 +0000 (11:35 +0000)]
git-debrebase: README: change diagrams to use @ for anchor
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 11:32:21 +0000 (11:32 +0000)]
git-debrebase: Introduce term `anchor'
And replace `breakwater merge' and `breakwater upstream merge'
everywhere.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 00:16:21 +0000 (00:16 +0000)]
git-debrebase: NOTES: done test suite, pretty much
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 00:15:49 +0000 (00:15 +0000)]
git-debrebase: test suite: gdr nmu divergence: check that divergence check trips on nmus
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 00:07:05 +0000 (00:07 +0000)]
git-debrebase: fix ffq divergence checking (many bugs)
Also add some debugging to ffq checking
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 00:06:14 +0000 (00:06 +0000)]
git-debrebase: fix cfg in scalar context (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 00:10:04 +0000 (00:10 +0000)]
git-debrebase: test suite: gdr nmu divergence: do maintainer first
In practical terms this is needed because we are only using one tree,
and otherwise the nmu's dgit push will update dgit/dgit/sid, causing
the ffq check to fail (when we fix it, in a moment).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 23:33:03 +0000 (23:33 +0000)]
git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-fail
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 23:30:24 +0000 (23:30 +0000)]
git-debrebase: test suite: gdr-diverge-nmu-dgit: new test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 23:29:44 +0000 (23:29 +0000)]
git-debrebase: test suite: lib-gdr: break out some more t-*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 23:26:53 +0000 (23:26 +0000)]
git-debrebase: test suite: lib-gdr: break out some more t-*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 23:07:56 +0000 (23:07 +0000)]
git-debrebase: test suite: gdr-diverge-nmu: complete
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 22:52:36 +0000 (22:52 +0000)]
git-debrebase: test suite: gdr-diverge-nmu: more work, still need to check
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 22:52:11 +0000 (22:52 +0000)]
git-debrebase: test suite: gdr-diverge-nmu: add some t-git-next-date
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 22:51:16 +0000 (22:51 +0000)]
git-debrebase: do not bomb on totally ambiguous pseudomerges
Actually, we want `git-merge -s ours' (or `git-debrebase stitch')
to be comprehended. We sacrifice `git-merge -s theirs'.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 22:38:22 +0000 (22:38 +0000)]
git-debrebase: test suite: gdr-diverge-nmu: add a t-git-next-date
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 22:38:02 +0000 (22:38 +0000)]
git-debrebase: print more why on Unprocessable commits
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 22:37:47 +0000 (22:37 +0000)]
git-debrebase: bomb on totally ambiguous pseudomerges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 22:19:49 +0000 (22:19 +0000)]
git-debrebase: test suite: gdr-diverge-nmu: new test, not complete yet
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 21:05:09 +0000 (21:05 +0000)]
git-debrebase: test suite: lib-gdr: introduce t-nmu-upload-3
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 20:50:14 +0000 (20:50 +0000)]
git-debrebase: test suite: lib-gdr: move t-nmu-upload-[12]
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 20:44:53 +0000 (20:44 +0000)]
git-debrebase: test suite: gdr-viagit: new test
Have verified with this:
diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit
index
55fe4d74..
20576c23 100755
--- a/tests/tests/gdr-viagit
+++ b/tests/tests/gdr-viagit
@@ -17,6 +17,7 @@ git-debrebase) ;;
cat <<'END' >$st
#!/bin/sh
set -x
+export GIT_DIR=$PWD/`git-rev-parse --git-dir`
exec "$DGIT_GITDEBREBASE_TEST_REAL" "$@"
END
chmod +x $st
that this would indeed spot at least some problems.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 19:41:36 +0000 (19:41 +0000)]
git-debrebase: test suite: gdr-import-dgit: test a new upstream non-gdr upload too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 19:37:40 +0000 (19:37 +0000)]
git-debrebase: test suite: lib-gdr: add some t-git-next-date calls
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 19:25:12 +0000 (19:25 +0000)]
git-debrebase: test suite: gdr-convert-gbp: use t-dch-commit one more time
We want the date-smashing done by t-dch-commit.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 19:23:58 +0000 (19:23 +0000)]
git-debrebase: test suite: gdr-*: use faketime to control dch dates
This means that the dgit- and gdr-generated commits with dates from
changelogs are all adjusted. This makes the gitk in the gdr tests
look more like a real one would, so we can see if it's pretty. (It
also makes it easier to debug the tests.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 19:23:02 +0000 (19:23 +0000)]
git-debrebase: test suite: gdr-*: add a bunch of calls to t-git-next-date
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 19:20:50 +0000 (19:20 +0000)]
test suite: Update dummy dates
To make things look nice in gitk in our test trees, etc., it is nice
if the fake date is at least as recent as the commits etc. in the
worktree tarballs and pkg-srcs.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 18:57:03 +0000 (18:57 +0000)]
git-debrebase: test suite: gdr-import-dgit: introduce nmu-fold
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 18:49:21 +0000 (18:49 +0000)]
git-debrebase: test suite: gdr-import-dgit: add an upload to incorporate nmu
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 18:46:04 +0000 (18:46 +0000)]
git-debrebase: test suite: gdr-import-dgit: move switch back to master (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 18:45:49 +0000 (18:45 +0000)]
git-debrebase: test suite: gdr-import-dgit: move gbp import (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 18:12:48 +0000 (18:12 +0000)]
git-debrebase: test suite: gdr-import-dgit: introduce nmu-upload-1, -2
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 12:30:39 +0000 (12:30 +0000)]
git-debrebase: test suite: gdr-import-dgit: introduce nmu-upload (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 12:27:29 +0000 (12:27 +0000)]
git-debrebase: convert-to-gbp: mention commit tag
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 12:22:18 +0000 (12:22 +0000)]
git-debrebase: convert-from-gbp: fix usage comment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 12:22:06 +0000 (12:22 +0000)]
git-debrebase: convert-to-gbp: declare it not v0
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 12:21:09 +0000 (12:21 +0000)]
git-debrebase: convert-to-gbp: implementation seems to work
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 12:05:18 +0000 (12:05 +0000)]
git-debrebase: test suite: t-gdr-good: test git-debrebase breakwater
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 12:00:57 +0000 (12:00 +0000)]
git-debrebase: test suite: t-gdr-good: split up the big case into two (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 11:47:19 +0000 (11:47 +0000)]
git-debrebase: provide breakwater command
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 11:46:35 +0000 (11:46 +0000)]
git-debrebase: classify: provide Why for Unknown
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 11:24:05 +0000 (11:24 +0000)]
git-debrebase: NOTES: avoid merges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 11:21:51 +0000 (11:21 +0000)]
git-debrebase: test suite: do not dgit pull (sets a bad example)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 17 Feb 2018 11:19:57 +0000 (11:19 +0000)]
git-debrebase: NOTES: about divergence and merges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 22:44:13 +0000 (22:44 +0000)]
git-debrebase: slight message improvements etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 22:43:45 +0000 (22:43 +0000)]
git-debrebase: rename gbp2gdr to convert-from-gbp
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 22:15:28 +0000 (22:15 +0000)]
git-debrebase: test suite: introduce t-make-new-upstream-tarball
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 21:53:38 +0000 (21:53 +0000)]
git-debrebase: test suite: note we've added a test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 21:14:20 +0000 (21:14 +0000)]
git-debrebase: test suite: gdr-import-dgit: extend
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 21:13:56 +0000 (21:13 +0000)]
git-debrebase: test suite: gdr-import-dgit: extend
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 21:13:41 +0000 (21:13 +0000)]
git-debrebase: bugfix
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 21:06:45 +0000 (21:06 +0000)]
git-debrebase: drop a superfluous rm_subdir_cached qw(debian/patches)
This is done by $read_tree_debian->($cltree). So nfc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 20:55:07 +0000 (20:55 +0000)]
git-debrebase: test suite: add a missing --quiet to git-diff
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 20:34:30 +0000 (20:34 +0000)]
git-debrebase: test suite: introduce t-gdr-good
And abolish the two things it was made of.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 20:32:38 +0000 (20:32 +0000)]
git-debrebase: test suite: introduce t-gdr-same-as-before
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 20:30:32 +0000 (20:30 +0000)]
git-debrebase: dgit import: honour $upp_limit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 20:24:56 +0000 (20:24 +0000)]
git-debrebase: DgitImportUnpatched: defer upstream diff check
We can't do this during the initial walk, because what we ought to be
comparing is the previous breakwater with the new one. So we have to
wait until the walk has proceeded down the overwritten branch, to find
the old breakwater.
This can be done by waiting until we are rebuilding the branch: at
that point, we have just built the previous breakwater, so we can
compare it to the dgit unpatched import.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 20:21:51 +0000 (20:21 +0000)]
git-debrebase: fix Overwritten to be an array like it says, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 15:48:06 +0000 (15:48 +0000)]
git-debrebase: test suite: gdr-import-dgit: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 15:13:24 +0000 (15:13 +0000)]
git-debrebase: test suite: introduce t-some-changes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 15:09:18 +0000 (15:09 +0000)]
git-debrebase: test suite: introduce t-dch-commit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 15:01:03 +0000 (15:01 +0000)]
git-debrebase: test suite: gdr-edits: check branch structure after last push
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 14:55:48 +0000 (14:55 +0000)]
git-debrebase: test suite: gdr-edits: do a push
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 14:55:34 +0000 (14:55 +0000)]
git-debrebase: test suite: gbp2gdr: fix not-gdr-processable to not modify things
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 14:45:18 +0000 (14:45 +0000)]
git-debrebase: test suite: gbp2gdr: process incoming
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 14:44:59 +0000 (14:44 +0000)]
git-debrebase: NOTES: another todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 11:49:44 +0000 (11:49 +0000)]
git-debrebase: test: check branch structure, more
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 11:49:05 +0000 (11:49 +0000)]
git-debrebase: test: check branch structure
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 09:06:06 +0000 (09:06 +0000)]
git-debrebase: some NOTES
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 09:04:28 +0000 (09:04 +0000)]
test suite: note some todos for gdr-edits
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 16 Feb 2018 09:01:38 +0000 (09:01 +0000)]
git-debrebase: stitch better
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 15 Feb 2018 20:18:24 +0000 (20:18 +0000)]
git-debrebase: wip stitch
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 15 Feb 2018 20:17:12 +0000 (20:17 +0000)]
git-debrebase: record ffq-prev on rebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 15 Feb 2018 20:16:42 +0000 (20:16 +0000)]
git-debrebase: break out ffq_prev_branchinfo (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / dgit.git / log